| 2007-05-28 |
|
Garoth
| Yeah | 00:00 |
|
gitte
| You should be in some git tracked local repo. | 00:00 |
|
Garoth
| Should I be in that? | 00:00 |
|
gitte
| ~garoth should suffice if you have ~garoth/.git. | 00:00 |
|
Garoth
| Hmm, ok | 00:00 |
|
gitte
| But the question is: what did you commit there? | 00:00 |
|
Garoth
| Ok, this is what I did for my testing | 00:00 |
|
gitte
| git-clone will only clone committed data. | 00:00 |
|
Garoth
| I went to Desktop/LeveledSpin, committed everything from there (php files) | 00:01 |
|
| Then, I went to ~garoth and did the command | 00:01 |
|
| ideas? | 00:01 |
|
gitte
| What does gitk say in ~garoth? | 00:02 |
|
Garoth
| Uh, says that there is a commit | 00:03 |
|
| With my 5 files | 00:03 |
|
gitte
| And what does "(cd ~garoth/cloned; gitk)" say? | 00:04 |
|
Garoth
| Exact same screen | 00:04 |
|
| wait, no | 00:05 |
|
| sorry, one sec | 00:05 |
|
| Yes, same thing | 00:05 |
|
| Does this operation work for you? | 00:06 |
|
| Interestingly, clone -l . ./folder | 00:09 |
|
| copies the entire .git folder into the destination | 00:09 |
|
| gitte: well, thanks for your help :) | 00:10 |
|
| I'll try and figure it out, I guess. | 00:10 |
|
| actually... | 00:10 |
|
gitte
| Sorry, was away for a few minutes. | 00:11 |
|
Garoth
| So, I've discovered that it does copy the .git folder | 00:11 |
|
| But I just want what I commited... any way to do that? | 00:11 |
|
gitte
| So, you want just a snapshot? | 00:12 |
|
Garoth
| Sorry, I guess that is what I want (new to the terms) | 00:12 |
|
gitte
| I'd use git-archive for that. | 00:12 |
|
Garoth
| I tried that a bit... kept making blank archives | 00:13 |
|
gitte
| A clone really clones not just the newest revisions, but the whole history. | 00:13 |
|
Garoth
| (using it wrong for sure :D ) | 00:13 |
|
| I see | 00:13 |
|
gitte
| You are on branch "master", right? (Use git-branch to find out) | 00:13 |
|
Garoth
| yeah | 00:13 |
|
| My only branch | 00:13 |
|
gitte
| So, what I would do to get such a snapshot: | 00:14 |
|
Garoth
| :) | 00:14 |
|
gitte
| git archive master the/path/I/want/it/in/ | tar xvf - | 00:14 |
|
Garoth
| Hmm | 00:14 |
|
| That's an odd command... it takes the files using the archive command and pipes a folder, and the files to the tar command? | 00:15 |
|
| "you must specify an archive format" | 00:15 |
|
| git archive master ./Desktop/cloned | tar xvf - | 00:15 |
|
| git archive --format=tar master ./Desktop/cloned | tar xvf - is correct? | 00:16 |
|
gitte
| Sorry, I always run the Git version from Git's "next" branch. | 00:16 |
|
| Yep. | 00:16 |
|
Garoth
| Hmm | 00:16 |
|
| I... didn't get an archive. | 00:16 |
|
gitte
| That should give you a snapshot (or detached checkout, or whatever you want to call it) in Desktop/cloned/ | 00:17 |
|
| Oops. | 00:17 |
|
| You have to say ./Desktop/cloned/ (note the trailing slash) | 00:17 |
|
Garoth
| Oh, I see | 00:17 |
|
| argh | 00:17 |
|
| I can only export to tracked directories? | 00:17 |
|
gitte
| Nope. | 00:18 |
|
Garoth
| git archive --format=tar master ./Desktop/ | tar xvf - | 00:18 |
|
| fatal: current working directory is untracked | 00:18 |
|
gitte
| You can do something like "git archive [...] | (cd /tmp; tar xf -)" | 00:18 |
|
| Aren't you in ~gareth? | 00:18 |
|
Garoth
| Doh :D | 00:18 |
| → puzzles joined | 00:19 |
|
Garoth
| Uh.... | 00:19 |
|
| Sorry, still not getting anything (and no error) | 00:19 |
|
| Command I'm doing: git archive --format=tar master ./Desktop/cloned/ | tar xvf - | 00:19 |
|
| Man, I'm horrible at this! | 00:19 |
|
gitte
| Same error? | 00:20 |
|
Garoth
| No error | 00:20 |
|
| All signs point to it having worked, but no file | 00:20 |
|
gitte
| Say "Desktop/cloned/", i.e. leave out the "./". | 00:21 |
|
Garoth
| Oh, ok | 00:21 |
|
| Nothing | 00:21 |
|
gitte
| If there is no output, then your tar did not expand anything (that's what the "v" is for in "xvf") | 00:21 |
|
| Try "tvf" instead of "xvf"? | 00:21 |
|
Garoth
| verbose | 00:21 |
|
gitte
| Yep. | 00:22 |
|
Garoth
| Nothing... | 00:22 |
|
| Hmm | 00:22 |
|
| Any way to check that I have stuff in my repository? | 00:22 |
|
gitte
| git-ls-tree HEAD | 00:23 |
|
Garoth
| Comes up blank | 00:23 |
|
| What have I done wrong? | 00:23 |
|
gitte
| git-ls-tree master? | 00:23 |
|
Garoth
| blank | 00:23 |
|
gitte
| git show master? | 00:24 |
|
Garoth
| That makes me think there is nothing in the repository... | 00:24 |
|
gitte
| Me, too. | 00:24 |
|
Garoth
| This, though, makes me think there was a commit | 00:24 |
|
| commit e4d67ac95c7158d88c45d0e9a825f02be286a3f6 | 00:24 |
|
| Author: Andrei Thorp <garoth@DeepThought.(none)> | 00:24 |
|
| Date: Sun May 27 19:25:51 2007 -0400 | 00:24 |
|
| Main commit of the Level | 00:24 |
|
| Yadda yadda | 00:24 |
|
| Shows the files and their contents after that | 00:24 |
|
gitte
| Hmm. Strange. | 00:25 |
|
Garoth
| Shall I try re-committing the file? | 00:25 |
|
| "nothing to commit" | 00:25 |
|
gitte
| Should not be needed, if "git show" does not come up empty. | 00:25 |
|
Garoth
| Oh well | 00:27 |
|
| gitte: thanks a lot for all your tips | 00:27 |
|
| I probably made some bad error along the way :) | 00:27 |
|
| But I have to go | 00:28 |
|
gitte
| One more? | 00:28 |
|
Garoth
| Sure | 00:28 |
|
gitte
| git ls-tree e4d67ac95c7158d88c45d0e9a825f02be286a3f6 | 00:28 |
|
Garoth
| Blank... | 00:28 |
|
| Can't explain it. | 00:28 |
|
gitte
| But "git show" printed a diff? | 00:28 |
|
Garoth
| I think so... | 00:28 |
|
| Let me show it to you. | 00:28 |
| → orospakr joined | 00:29 |
|
DraX
| so the %h abbreviated hashes are 8 characters by default, if there is a conflict will they be longer? | 00:29 |
|
Garoth
| gitte: http://www.mercenariesguild.net/pastebin/pastebin.php?show=76 | 00:30 |
|
tchan
| how about something simple like: cd ~/garoth && git-archive master > ~/master.tar | 00:30 |
|
Garoth
| Don't look too close at the code :D | 00:30 |
|
| gotta specify a format | 00:31 |
|
gitte
| Garoth: Seems like you deleted the file: | 00:31 |
|
Garoth
| Heh | 00:31 |
|
| That would do it :D | 00:31 |
|
gitte
| 10. deleted file mode 100644 | 00:31 |
|
Garoth
| I was under the impression that I deleted it and then put it back, though | 00:32 |
|
| But this makes sense.... | 00:32 |
| → mithro joined | 00:32 |
|
gitte
| So, git-ls-tree master^ should not come up empty... | 00:32 |
|
Garoth
| No, not empty | 00:32 |
|
| Not sure what it means, but it is not empty. | 00:32 |
|
| 040000 tree 654dd05be3cacfc5f2eacc5d64479d5a8cd063b8 Desktop | 00:33 |
|
| Ok, so how do I get my files back in there? | 00:33 |
|
gitte
| Means that it contains a directory "Desktop". | 00:33 |
|
Garoth
| Hmm | 00:33 |
|
| That's news to me... | 00:33 |
|
gitte
| Was the deletion accidental? | 00:33 |
|
| "master^" is not the current tip of the branch, but its parent. | 00:34 |
|
Garoth
| No, I screwed up the commit, wanted to delete it and do a new one | 00:34 |
|
| Its still news to me that I added desktop to the repo. | 00:34 |
|
| Ok. Can I dump the entire git thing and try again? | 00:35 |
|
| Probably a matter of deleting .git, right? | 00:35 |
|
gitte
| Wait a minute. | 00:35 |
|
| Not all is lost. | 00:35 |
|
Garoth
| Oh? | 00:35 |
|
| (revision control to the rescue) | 00:35 |
|
| :D | 00:35 |
|
gitte
| If the last commit was the only one that was bad, you can get back to the state before that with "git reset --hard master^" | 00:36 |
|
Garoth
| Ok | 00:36 |
|
| So I'm back to that state where I have Desktop in my repo for some reason (and nothing else) | 00:37 |
|
gitte
| Yes. | 00:37 |
|
Garoth
| Odd... | 00:37 |
|
| Ok, so I have some php files in ~garoth/Desktop/LeveledSpin | 00:38 |
|
| How can I grab those? | 00:38 |
|
gitte
| Aren't they in "git ls-tree HEAD" now? | 00:39 |
|
Garoth
| Oh, so they are | 00:39 |
|
| But they aren't in master? | 00:39 |
|
gitte
| They are now. | 00:39 |
|
| With "git reset [...]" you basically undid the last commit. | 00:40 |
|
Garoth
| Uh... | 00:40 |
|
| Yeah... | 00:40 |
|
| Spooky, though | 00:40 |
|
| I thought I just didn't see them in master... | 00:40 |
|
| But there they are. | 00:40 |
|
| Ok, great! | 00:40 |
|
| :D | 00:40 |
|
| Oh, beautiful | 00:41 |
|
| And I got them into a tar archive now too! | 00:41 |
|
gitte
| Congratulations! | 00:41 |
|
Garoth
| (with: git archive --format=tar master > ~/master.tar) | 00:41 |
|
gitte
| Well, I think that you will like the user manual... | 00:41 |
|
Garoth
| Pass it on, maybe I was looking at the wrong one | 00:42 |
|
| http://www.kernel.org/pub/software/scm/git/docs/user-manual.html | 00:42 |
|
tchan
| and from a working local repository, this worked just fine here: cd ~ && git clone ~/garoth new.git | 00:42 |
|
Garoth
| Is what I've been looking at in confusion | 00:42 |
|
| tchan: really... | 00:42 |
|
tchan
| yup, I just tried it from several copies of local git repos | 00:43 |
|
| I have a copy of elinks.git, I did a cd ~ && git-clone ~/elinks.git test.git | 00:43 |
|
Garoth
| Oh, I see | 00:43 |
|
| It copies the entire path, that's interesting | 00:43 |
|
jasam
| is safe to call remove() with a file that does not exist? | 00:44 |
|
tchan
| and it created test.git directory and it is a full working elinks.git repo | 00:44 |
|
Garoth
| Yeah, nice one | 00:44 |
|
| Wow, thanks a lot guys! | 00:44 |
|
| gitte: thanks man :) | 00:44 |
|
gitte
| No problem, man :-) | 00:44 |
|
Garoth
| This is an awesome tool, look forward to learning it more | 00:44 |
|
| Every time I think about it though, I think about the brilliance of Linus... | 00:45 |
|
| He made this in like a week, wow :D | 00:45 |
|
| Anyways, I REALLY need to go work | 00:45 |
|
| I've procrastinated studying for my test tomorrow all day :) | 00:45 |
|
| See you lads later | 00:45 |
| ← Garoth left | 00:46 |
| → Garoth joined | 00:46 |
| ← Garoth left | 00:46 |
|
jasam
| gitte, what do you think? | 00:47 |
|
gitte
| jasam: After my second glass of wine... I think I really should go to bed ;-) | 00:47 |
|
jasam
| :) | 00:47 |
|
| in such case, good night! | 00:48 |
|
gitte
| ;-) | 00:49 |
|
| The idea with temporary files... maybe you should do it with lockfiles? | 00:49 |
|
| Just my last 3cents for today... | 00:49 |
|
| gitte wishes he were young and foolish again, not asleep at 2am already | 00:49 |
|
jasam
| :) | 00:50 |
|
| I will think about what those lockfiles are... | 00:50 |
|
gitte
| Basically, the file is created with ".lock" appended to the filename | 00:50 |
|
| if it already exists, it will error out. | 00:51 |
|
| Once you're done, you "commit" the file. (As in transaction commit) | 00:51 |
|
| If not, it is rolled back. | 00:51 |
|
| If you die(), it is rolled back. | 00:51 |
|
jasam
| I just want not care about if file was created or not at the end of the program | 00:51 |
|
| just remove it only if exists | 00:52 |
|
| I think about you said, I don't understand now | 00:52 |
|
gitte
| Yeah, the lockfiles do that for you. | 00:52 |
|
| Anyway, have to go to bed now... good night everybody. | 00:53 |
|
jasam
| good night! | 00:53 |
| → christi joined | 01:07 |
| → Roomster joined | 01:19 |
| → rkaway1 joined | 01:30 |
| → xjjk joined | 01:41 |
| → rkaway1 joined | 01:49 |
| → rkaway1 joined | 01:51 |
| → rkaway2 joined | 01:51 |
| → rphillips joined | 01:52 |
| → spearce joined | 03:07 |
| → mithro joined | 03:22 |
| → swetland joined | 04:17 |
|
swetland
| possibly a dumb question, but I haven't found an answer in the various docs so far: | 04:18 |
|
| if I have a branch where I've committed a bunch of little incremental changes, is there a way to combine those commits into a single commit suitable for submitting upstream as just a single patch? | 04:19 |
| → rkaway2 joined | 04:27 |
|
swetland
| guess I can just format-patch against the target, checkout the target, apply the set of patches with patch, commit the results of that as a unit. not too terrible | 04:28 |
|
| or just git diff mainline workingbranch. guess you can do this a bunch of different ways, just not by a oneshot git command (though possibly I've just missed it) | 04:37 |
|
mugwump
| swetland: get stacked git, you won't look back | 05:08 |
|
swetland
| I'll have to check it out sometime. I want to start with a solid understanding of the core stuff before adding layers on top. as of 1.5.x the core stuff seems a lot friendlier than when I last looked (1.3ish timeframe?) | 05:17 |
|
mugwump
| sure. lots of people keep moaning about usability issues. Despite instructions to "get hard" they keep sending usability patches | 05:18 |
|
qiyong
| how to show all the tags, and switch to one? | 05:28 |
|
| another problem | 05:31 |
|
| ~/linux/linux-2.6> git show 7b7fc708b568a258595e1fa911b930a75ac07b48 | 05:31 |
|
| commit 7b7fc708b568a258595e1fa911b930a75ac07b48 | 05:31 |
|
| Merge: c7a3bd1... 8c34e2d... | 05:31 |
|
| Author: Linus Torvalds [email@hidden.address] | 05:31 |
|
| Date: Sat Oct 21 10:01:52 2006 -0700 | 05:31 |
|
| Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block | 05:31 |
|
| | 05:31 |
|
| * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block: | 05:31 |
|
| [PATCH] Remove SUID when splicing into an inode | 05:31 |
|
| [PATCH] Add lockless helpers for remove_suid() | 05:31 |
|
| [PATCH] Introduce generic_file_splice_write_nolock() | 05:31 |
|
| [PATCH] Take i_mutex in splice_from_pipe() | 05:31 |
|
| how to I see the patch: [PATCH] Remove SUID when splicing into an inode ? | 05:31 |
|
| how to see that branch? | 05:32 |
|
mugwump
| ok. wèn ti yī: git-show-refs --tags | 05:33 |
|
qiyong
| :) | 05:33 |
|
| how can you type in è ī | 05:34 |
|
mugwump
| git-checkout tagname works on git v1.5+ | 05:34 |
|
| I hit compose ` e | 05:34 |
|
qiyong
| in your x windows? | 05:34 |
|
mugwump
| yep | 05:35 |
|
qiyong
| you can't type in \/ :p | 05:35 |
|
mugwump
| as in hànyǚ? | 05:35 |
|
qiyong
| err... | 05:35 |
|
| cool | 05:36 |
|
mugwump
| I got that wrong didn't I | 05:36 |
|
qiyong
| what is the compose key? | 05:36 |
|
| you did you correct | 05:36 |
|
mugwump
| should have been just hànyǔ | 05:37 |
|
qiyong
| s/you/it/ | 05:37 |
|
mugwump
| anyway | 05:37 |
|
qiyong
| oh, yes | 05:37 |
|
mugwump
| depends on your keyboard map | 05:37 |
|
qiyong
| what's you map? | 05:37 |
|
mugwump
| run "xev", and try right alt/win | 05:37 |
|
| any key that says "Multi_key" in xev is the one you want | 05:37 |
|
| usually you can configure it using, eg, keyboard preferences in gnome | 05:38 |
|
qiyong
| i don't find multi_key, my right win is super_r | 05:40 |
|
| how can you learnt some much chinese? | 05:41 |
| → dkagedal joined | 05:41 |
|
mugwump
| http://mail.pm.org/pipermail/wellington-pm/2005-June/000338.html # more on configuring keyboard, if the keyboard preferences don't give you much joy | 05:42 |
|
qiyong
| mugwump, how did you learn chinese? | 05:44 |
|
mugwump
| I live in NZ ... 10% or so Chinese here | 05:45 |
|
qiyong
| (default us layout doesn't have compose key, right? unless you add "XkbOptions" "compose:rwin") | 05:46 |
|
| qiyong wants to move to nz too. | 05:46 |
|
mugwump
| yes.. the alt-intl layout should have everything on it - http://www.jw-stumpel.nl/stestu.html | 05:46 |
|
qiyong
| how about the second question? | 05:48 |
|
| mugwump, btw, learn to read/write the character, more fun than pinyin | 05:49 |
|
mugwump
| just use git-log on the commit and search for the description. | 05:49 |
|
qiyong
| mugwump, then i want to read the diff | 05:49 |
|
| git show doesn't work for merge | 05:49 |
|
| branch merge | 05:49 |
|
| git show only shows descriptions i pasted above | 05:50 |
|
mugwump
| ok, so the commit is somewhere between 7b7fc70 and the last merge base | 05:51 |
|
| you need to find that first | 05:51 |
|
qiyong
| <mugwump> ok. wèn ti yī: git-show-refs --tags | 05:51 |
|
mugwump
| eg, look in git-log 7b7fc70 ^`git merge-base 7b7fc70^1 7b7fc70^2` | 05:52 |
|
qiyong
| git-show-ref <~~ works for me | 05:52 |
|
mugwump
| (but you don't need to cut history with the merge base like I did) | 05:52 |
|
| when you find the patch with the same description, the commit ID will be there | 05:52 |
|
| You should find the commit by Jens Axboe, Oct 17 2006 - id 8c34e2d | 05:53 |
|
| so then git-show 8c34e2d should show you the patch | 05:54 |
|
| you could also find it in gitk by pasting the patch description into the search box and hitting "find" | 05:54 |
|
qiyong
| i just search twice in git log | 05:54 |
|
mugwump
| you were searching for "Remove SUID when splicing into an inode" ? | 05:56 |
|
qiyong
| yes | 05:57 |
|
mugwump
| so, git-log 7b7fc708, search for "Remove SUID when splicing"... and it appears twice, first in commit 7b7fc70's comment, second in commit 8c34e2d's comment | 05:59 |
|
qiyong
| git tree merge will result in two comments | 05:59 |
|
| for one commit | 05:59 |
|
| seems | 05:59 |
|
| like hg | 06:00 |
|
mugwump
| Linus put that summary in the merge commit message himself | 06:00 |
|
| he merged this branch: git-log 7b7fc70 ^7b7fc70^1 | 06:01 |
|
qiyong
| commit 7b7fc708b568a258595e1fa911b930a75ac07b48 contains no diffs? | 06:02 |
|
| what is ^ ? | 06:02 |
|
mugwump
| see git-rev-parse for meaning of ^ | 06:02 |
|
gitster``
| Why not do "git log -p --grep='Remove SUID when splicing'"? | 06:02 |
|
mugwump
| because I didn't know about that, gitster`` | 06:02 |
|
| :) | 06:03 |
|
gitster``
| you do now ;-) | 06:03 |
|
| if gitte were still awake, he would say "git show ';/[PATCH] Remove SUID when'" | 06:04 |
|
mugwump
| wow, interesting rev-parse spec. obviously I haven't read the man page in a while | 06:04 |
|
qiyong
| why linus made a commit without any diff? | 06:05 |
|
mugwump
| there was a diff, but it's a merge diff with two parents - gitk will show it | 06:05 |
|
qiyong
| git show doesn't show it? | 06:05 |
|
mugwump
| I guess nobody needed that. you couldn't apply it with "patch" anyway | 06:06 |
|
gitster``
| If you really want to, you could ask "git show -m -p $that_commit" | 06:07 |
|
mugwump
| cripes what version of git am I on on this laptop | 06:07 |
|
| 1.5.0.4, that explains it | 06:07 |
|
qiyong
| gitster``, what is ; in ';/[PATHC ? | 06:21 |
| → puzzles joined | 06:26 |
| → spearce joined | 06:33 |
|
spearce
| qiyong: that ; is a : | 06:35 |
|
| spearce suffered a drive failure tonight. arrrrrgh. | 06:35 |
| → puzzels joined | 06:36 |
|
qiyong
| spearce, what : means there? | 06:37 |
|
spearce
| :/ there means "search for the most recent commit whose subject line matches the remaining text". | 06:37 |
| → etnt joined | 06:40 |
| puzzels → pizzles | 06:56 |
| pizzles → puzzles | 06:56 |
| → ofri joined | 07:11 |
| → Stalwart joined | 08:09 |
| → devogon joined | 08:12 |
| → mithro joined | 08:19 |
| → stalwart1 joined | 08:48 |
| → lyakh joined | 08:49 |
| → Roomster joined | 08:56 |
| → mneisen joined | 09:03 |
| → thomasbe joined | 09:06 |
| → dkagedal joined | 09:09 |
| ← dduncan left | 09:11 |
| → nud joined | 09:49 |
| → Stalwart joined | 10:14 |
| → hein joined | 10:31 |
| hein → Sho_ | 10:32 |
| → Pistahhh joined | 11:21 |
| Pistahhh → Pistahh | 11:37 |
| → chris2 joined | 11:43 |
| → Oeje1 joined | 11:53 |
| → lyakh joined | 12:38 |
| → Noooop joined | 12:46 |
| ← Noooop left | 12:54 |
| → kanru joined | 13:23 |
| → mneisen joined | 13:24 |
| → mneisen joined | 13:39 |
| → spuk- joined | 13:49 |
| → lu_zero joined | 14:15 |
| → ofri joined | 14:18 |
| → gitte joined | 14:21 |
| → orospakr joined | 14:24 |
| → lcapitulino joined | 14:31 |
| → Pistahh joined | 14:48 |
| → Pistahh joined | 14:57 |
| → chris2 joined | 15:00 |
| → Pistahhh joined | 15:10 |
| → robinr joined | 15:16 |
| → Pistahh joined | 15:23 |
| → rphillips joined | 15:44 |
| → Pistahhh joined | 15:50 |
| Pistahhh → Pistahh | 16:08 |
|
| tronical wonders if Han-Wen is here on irc | 16:10 |
| → Pistahh joined | 16:17 |
| → kanru joined | 16:20 |
| → ofri joined | 16:26 |
| → ferdy joined | 16:30 |
| → Pistahhh joined | 16:30 |
| _mounti → mountie | 16:37 |
| → _mountie joined | 16:43 |
| → mneisen joined | 16:44 |
| Pistahhh → Pistahh | 16:45 |
| → strangy joined | 16:59 |
| → yann joined | 17:13 |
|
lcapitulino
| do I need anything more than 'git fetch -f' to create a local mirror? | 17:19 |
|
robinr
| what is the input format to git-fmt-merge-msg? | 17:23 |
| → Oeje1 joined | 17:35 |
| → context joined | 17:36 |
| _mountie → mountie | 17:47 |
| → Eludias joined | 18:09 |
| → guest1976 joined | 18:10 |
| guest1976 → blabla | 18:11 |
| blabla → mneisen | 18:13 |
| → p_masho joined | 18:39 |
|
p_masho
| just downlaoded GIT 1.5.2/ tarball .. and when I run "make" i get /bin/sh: curl-config: not found? which lib do I need for that!! on ubuntu (newbie) | 18:40 |
|
lu_zero
| p_masho libcurl? | 18:40 |
|
tko
| p_masho: libcurl-dev | 18:41 |
|
| p_masho: or probably easier: apt-get build-dep git-core | 18:41 |
|
p_masho
| ok .. will try... shame that its the olde 1.4.X series on Ubuntu :-( (there again its good to compile ocassinally pete) | 18:42 |
|
| tko: ta .. its number crunching now :-) | 18:43 |
| → ofri joined | 18:49 |
|
p_masho
| how do I set the editor for the commit message to nano instead of vi ? (newbie question) | 18:56 |
|
| p_masho ahhh VISUAL | 18:58 |
| → Dodji joined | 19:00 |
| → gitte joined | 19:11 |
| → robfitz joined | 19:15 |
|
p_masho
| I run "gitk" and I get "exec: 3: wish: not found" ? which package do i need for that ? | 19:16 |
|
gitte
| tk | 19:17 |
|
| p_masho WHAW .... nice ;-) | 19:20 |
| → dduncan joined | 19:27 |
| → segher__ joined | 19:31 |
| → Dodji_ joined | 19:51 |
| → ferdy joined | 19:55 |
| → Pistahh joined | 19:58 |
| → Pistahhh joined | 20:04 |
| → Pistahhh_ joined | 20:10 |
| → yorgen15 joined | 20:13 |
| Pistahhh_ → Pistahh | 20:18 |
| → ofri joined | 20:25 |
| → felipec joined | 20:30 |
|
felipec
| does anyone have any idea how can I push to here? http://repo.or.cz/w/ruby-sheller.git | 20:31 |
|
| I cannot clone that, so I suppose I have to push first, but I'm not sure | 20:31 |
|
tokkee
| felipec: You do not have to push to be able to clone. | 20:32 |
|
| felipec: What kind of errors do you get? | 20:32 |
|
felipec
| Initialized empty Git repository in /tmp/tmp/ruby-sheller/.git/ | 20:32 |
|
| fatal: no matching remote head | 20:32 |
|
| fetch-pack from 'git+ssh://repo.or.cz/srv/git/ruby-sheller.git' failed. | 20:32 |
|
| tokkee: it seems it has been badly set up: http://repo.or.cz/r/ruby-sheller.git/refs/heads/ | 20:34 |
|
tokkee
| felipec: That does look pretty broken... | 20:35 |
|
felipec
| tokkee: pff, it's a project just created from repo.or.cz | 20:35 |
|
tokkee
| felipec: http://repo.or.cz/r/ruby-sheller.git/objects/ ... its an empty repository... | 20:35 |
|
felipec
| does anyone knows about any decent alternative for git project hosting? | 20:36 |
|
tokkee
| $ dog http://repo.or.cz/ | grep 'No commits' | wc -l | 20:37 |
|
| 9 | 20:37 |
|
| There seem to be a couple of empty repositories... quite strange... | 20:37 |
|
| felipec: What exactly are you looking for? | 20:38 |
|
Tali
| tokkee: you don't ditinguish animals? ;-) | 20:40 |
|
| oh, your dog can fetch remote things, very nice trained :-) | 20:41 |
|
felipec
| tokkee: right now I want a place to put a bunch of scripts, it's a very small project, but it might grow | 20:41 |
|
tokkee
| Tali: It took me quite some time to get there ;-) | 20:42 |
|
| felipec: What's wrong with repo.or.cz? | 20:42 |
|
felipec
| tokkee: I cannot do anything? | 20:43 |
|
tokkee
| felipec: Oh... now I got your real problem... d'oh. | 20:44 |
|
Tali
| felipec: if the repository does not contain any branch with actual content yet then you can't clone it | 20:44 |
|
| felipec: you first have to push some content to it. And don't forget to explicitly name the branches you want to transfer: git push repo branch:branch | 20:45 |
|
felipec
| Tali: right, that's what I thought I should do... but I'm not sure about the branch:branch part | 20:46 |
|
Tali
| first the local branch name you want to upload, then after the ":" the name it should get on the remote side | 20:47 |
|
felipec
| Tali: like master:master ? | 20:48 |
|
Tali
| exactly :-) | 20:48 |
|
felipec
| error: unable to create temporary sha1 filename ./objects/tmp_obj_woij8Z: Permission denied | 20:50 |
|
| sweet | 20:50 |
|
Tali
| that does not look good :-( | 20:50 |
| → Pistahhh joined | 20:54 |
| → robin_ joined | 21:00 |
| → z3ro joined | 21:06 |
|
felipec
| the Linus tal should be on the topic =P | 21:07 |
|
| talk | 21:08 |
| → spearce joined | 21:09 |
|
tokkee
| felipec: There is no +t on this channel, so you're free to change the topic ;-) | 21:09 |
| felipec changed the topic to: 1.5.2/1.5.1.6 | Everyone asleep or clueless? Try [email@hidden.address] | Channel log http://colabti.de/irclogger/irclogger_log/git | Linus on git: http://youtube.com/watch?v=4XpnKHJAok8 | 21:16 |
| → ofri joined | 21:22 |
| → robinr joined | 21:26 |
| → robin_ joined | 21:31 |
| → rkaway1 joined | 21:38 |
| → gitster joined | 21:39 |
| → fhobia joined | 21:44 |
|
fhobia
| ...i did a funky glob with "git add" ..and now i get "fatal: index file open failed (Permission denied)" ..am I hosed ? | 21:45 |
|
spearce
| fhobia: what does `ls -ld . .git/index .git/index.lock` show? is index.lock present? is index present and at least readable/writable by you? is the directory writable by you? | 21:46 |
|
fhobia
| ...oh man, it shows --------- for the permissions...i made it 600 and it seems ok now | 21:47 |
|
| ::fhew:: thanks | 21:48 |
|
spearce
| sure. | 21:48 |
| → gitte joined | 21:49 |
|
fhobia
| interesting...if i do "git add index*.html" ...it blows up the permissions on the index..i could see how that maybe related..but hmm... | 21:50 |
| ← felipec left | 22:07 |
| → Matt__ joined | 22:41 |
| Matt__ → Seitz | 22:41 |
|
Seitz
| "git commit" is failing and reporting numerous "trailing whitespace" errors. Can I force "git commit" to commit despite the trailing whitespace? | 22:42 |
|
spearce
| Seitz: if you really really want to accept that crap, yes: --no-verify | 22:43 |
|
Seitz
| Thanks, I appreciate the help. | 22:43 |
|
spearce
| those whitespace errors are being generated by .git/hooks/pre-commit. | 22:43 |
|
Seitz
| Ah, so this may do more than turn off the whitespace checking. I'll take a look at the "pre-commit" file. | 22:44 |
|
spearce
| yea, pre-commit also looks for the RCS-style merge conflict markers. a good safety feature. | 22:44 |
|
gitte
| spearce: Heh, a new "what's in..."... | 23:22 |
|
spearce
| yea, i figured it was about time. | 23:40 |
|
| i'm not having good luck with computers though. i lost a harddrive yesterday and an entire system today. arrgh. | 23:40 |
|
gitte
| I am sorry to hear that. | 23:41 |
|
| Losing a hard drive is bad. | 23:41 |
|
| Maybe it's of consolation that I lost _twice_ a RAID, by losing _two_ drives from a RAID-5. | 23:41 |
|
| 3.7 terabyte went *poof* | 23:41 |
|
spearce
| i managed to recover about 99% of my data from the failed drive and backups. what email i did lose was sunday's git@vger traffic. not a whole lot, and its all in gmane. ;-) | 23:41 |
|
gitte
| Yeah, gmane is good. | 23:42 |
|
| Except that it makes it too easy for spummers. | 23:42 |
|
spearce
| yea, that's one risk of raid-5. i had a reseirfs go corrupt on a large array when both spares and one of the main drives died in a raid-5 config. kernel oops'd. | 23:42 |
|
gitte
| Yep. Same with me. | 23:42 |
|
| And I could not even recover anything, because the system was too large. | 23:42 |
|
spearce
| my latest issue is an older intel p4 won't f'ing boot. i haven't tried to start it in almost a year, but now it won't enable the main board power. | 23:42 |
|
| gitte is yearning for ZFS on Linux. *sigh* | 23:43 |
|
DraX
| gitte: switch to freebsd :) | 23:43 |
|
spearce
| i've been pretty happy with lvm+xfs, but yea, zfs has some interesting features. ;) | 23:43 |
|
gitte
| DraX: you don't want to tempt the innocent, do you? | 23:43 |
|
DraX
| heh | 23:44 |
|
gitte
| xfs has a subtle bug, last time I checked. | 23:49 |
|
| It even led to sporadic git failures... | 23:49 |
|
spearce
| never seen them myself. but i'm not surprised if there isn't a bug in there somewhere. | 23:50 |
|
gitte
| I was a happy user of xfs. | 23:51 |
|
| Was faster than reiser3 | 23:51 |
|
| DraX: I think I will never switch to FreeBSD, and I'll tell you why: | 23:51 |
|
| I really do not like the way BSD licensed software is abducted, exploited and misused. | 23:52 |
|
| That's why I stay clear of it. | 23:52 |
|
DraX
| gitte: I don't like the way the GPL is like united states foreign policy, marching upon the world bringing them ``freedom'' | 23:53 |
|
| gitte: but i _so_ don't want to have a license argument | 23:54 |
|
gitte
| DraX: the difference, of course, is that nobody forces you to use GPLed software. | 23:54 |
|
| And therefore, you are wrong. It is not at all like US foreign policy. | 23:54 |
|
DraX
| gitte: nobody forces your world leaders to have what the us declares a ``dictatorship'' | 23:54 |
|
gitte
| DraX: your argument falls down flat. | 23:54 |
|
| The people in New Texas did not have a choice. | 23:55 |
|
| ... and I did not ask you to choose anything different than FreeBSD, did I? | 23:55 |
|
DraX
| plese | 23:55 |
|
| can we not have a license argument? | 23:56 |
|
gitte
| Uhm. | 23:56 |
|
| I did not _want_ to have an argument. | 23:56 |
|
| I just stated why I don't like a certain OS myself. | 23:56 |
|
| And I reacted to an obviously false comparison. | 23:56 |
|
DraX
| i don't consider it false but i don't want to argue with you | 23:56 |
|
gitte
| I certainly did not want to attack _you_. | 23:57 |
|
DraX
| and i didn't want to argue with you from the beginning | 23:57 |
|
gitte
| So, since this is the first time that I remember talking to you, let's talk about something enjoyable. | 23:57 |
|
| How do you like Git? | 23:57 |
|
DraX
| how? | 23:58 |
|
gitte
| Does it compile out of the box on FreeBSD? | 23:58 |
|
DraX
| mostly | 23:58 |
|
gitte
| Does it have performance bottlenecks? | 23:58 |
|
| What is not working with the compile? | 23:58 |
|
| curl? | 23:58 |
|
DraX
| it actually compiles out of box | 23:59 |
|
| but we patch it a bit for stuff like obeying CFLAGS | 23:59 |
|
gitte
| Ah. | 23:59 |
|
DraX
| and support for disabling gitk | 23:59 |
|
| there are some issues with curl I think but I just use git-daemon | 23:59 |
|
| and ssh | 23:59 |
|
gitte
| Yes, the recent NO_GUI. | 23:59 |