| 2009-12-26 |
| → rhett joined | 00:00 |
| ngw → ngw|away | 00:01 |
| ngw|away → ngw | 00:02 |
| ← Paraselene_ left | 00:03 |
| wurstlprater → pSyPoInt3r | 00:04 |
| → __iron joined | 00:05 |
| ← maxter left | 00:06 |
| ← Sky[x] left | 00:07 |
| ← whaley left | 00:08 |
| → Paraselene_ joined | 00:09 |
| ← __iron left | 00:11 |
| ← pantsman left | 00:12 |
| ← sshc left | 00:12 |
| ← erikeldridge left | 00:12 |
| → wagle joined | 00:14 |
| ← nessundorma_ left | 00:15 |
| → nessundorma_ joined | 00:17 |
| ← d0k left | 00:17 |
| → shfx joined | 00:18 |
| ← Adlai left | 00:21 |
| → Adlai joined | 00:22 |
| → __iron joined | 00:23 |
| ← shfx left | 00:23 |
| → sanity joined | 00:24 |
|
sanity
| does git have an equivolent to svn's $LastChangedRevision$ mechanism? | 00:24 |
| → Turias joined | 00:24 |
| ← Turias left | 00:24 |
|
sanity
| ie. a variable that can go in a source file which will be automatically replaced with the revision number? | 00:24 |
|
Arrowmaster
| no | 00:25 |
| → D[a]vey joined | 00:26 |
|
Arrowmaster
| although it can be done sorta using either filters or the replacements that get done when you use git archive | 00:26 |
| → Simoyd joined | 00:28 |
| → catalis joined | 00:28 |
| ← catalis left | 00:28 |
| → catalis joined | 00:28 |
|
Simoyd
| when I use "git branch --track <blah>" (or the information shown in "git branch -vv"), where is the tracked branch name stored in the .git dir? (I want to change it) | 00:29 |
|
sanity
| Arrowmaster: ok, thx | 00:29 |
| ← pkw_ left | 00:29 |
|
Simoyd
| how can I change what branch a specific branch of mine is tracking? | 00:31 |
| → nessundorma joined | 00:31 |
|
wereHamster
| Simoyd: set branch.<name>.merge to refs/heads/<whatever> | 00:32 |
| ← AStorm left | 00:32 |
| ← nessundorma_ left | 00:33 |
| ← ness1d0rma left | 00:33 |
| ← catalis left | 00:34 |
| → Sky[x] joined | 00:35 |
|
Simoyd
| sick | 00:35 |
|
| thanks! | 00:35 |
|
wereHamster
| Simoyd: that information is stored in the config file (.git/config) | 00:35 |
| → catalis joined | 00:36 |
|
Simoyd
| oh... wow... I looked there but apparantly I'm blind. thankss! | 00:36 |
| → zackattack joined | 00:36 |
| ← catalis left | 00:37 |
| → babilen_ joined | 00:38 |
| ← babilen left | 00:38 |
| babilen_ → babilen | 00:38 |
| ← Yuuhi left | 00:39 |
| ← Simoyd left | 00:45 |
| ← __iron left | 00:45 |
| → erikvold joined | 00:47 |
| ← dazman left | 00:48 |
| ← project2501a left | 00:51 |
| → datechman joined | 00:51 |
| → JayM joined | 00:51 |
| → hipe joined | 00:52 |
| → __iron joined | 00:52 |
| → simcop2387 joined | 00:53 |
| ← gambler left | 00:55 |
| → yhager_ joined | 00:55 |
| ← yhager left | 00:57 |
| ← __iron left | 00:58 |
| → kpreid_ joined | 00:58 |
| ← Sky[x] left | 01:00 |
| → __iron joined | 01:03 |
| ← erikvold left | 01:04 |
| → wagle_ joined | 01:06 |
| ← wagle left | 01:06 |
| ← rhett left | 01:07 |
| ← hipe left | 01:09 |
| → defectiv joined | 01:11 |
| ← __iron left | 01:12 |
| → pkw joined | 01:16 |
| → mithro joined | 01:18 |
| ← brendon2020 left | 01:18 |
| → catalis joined | 01:20 |
| ← catalis left | 01:21 |
| → imajes joined | 01:22 |
|
defectiv
| how can i refer to the parent of a commit? | 01:23 |
|
| say i have the commit hash? | 01:23 |
|
wereHamster
| <hash>^1 | 01:23 |
|
defectiv
| hrm...tried that. | 01:23 |
|
wereHamster
| or ~1 | 01:23 |
|
defectiv
| i thought ~1 was a range. | 01:23 |
|
| fb178ca10^1 would work? | 01:24 |
|
wereHamster
| it should | 01:24 |
|
| ^n is n-th parent of that commit (merge commits have more than one parent) | 01:24 |
|
| ~n is n times ^1 | 01:25 |
| → __iron joined | 01:25 |
|
defectiv
| wait what's the difference? | 01:25 |
|
wereHamster
| defectiv: man git-rev-parse explains it better than I ever could | 01:25 |
|
defectiv
| oh i see what you mean. | 01:25 |
|
Gitbot
| defectiv: the git-rev-parse manpage can be found at http://git.or.cz/man/git-rev-parse | 01:25 |
| ← danopia left | 01:26 |
|
defectiv
| is there a good way to see when a file was introduced? | 01:27 |
| ngw → ngw|away | 01:29 |
| ngw|away → ngw | 01:29 |
| ← sgh left | 01:32 |
| → sgh joined | 01:32 |
|
Ilari
| defectiv: 'git log --diff-filter=C -- file'? | 01:33 |
| → godsflaw joined | 01:36 |
| ← kpreid_ left | 01:39 |
| → erikeldridge joined | 01:40 |
| ← erikeldridge left | 01:42 |
| → youwin joined | 01:43 |
| ← babilen left | 01:43 |
| ← defectiv left | 01:48 |
| ← nessundorma left | 01:52 |
| ← Determinist left | 01:55 |
| → wagle joined | 02:00 |
| ← cloudhead left | 02:01 |
| ← D[a]vey left | 02:01 |
| → schambers joined | 02:07 |
| → thiago_h1me joined | 02:08 |
| ← wagle_ left | 02:08 |
| ← sgh left | 02:10 |
| ← aziz left | 02:11 |
| ← sanity left | 02:12 |
| → s1kx- joined | 02:14 |
| → amirite joined | 02:16 |
| ← tjafk left | 02:16 |
| thiago_h1me → thiago | 02:17 |
| ← S1kx left | 02:17 |
| ← thiago left | 02:20 |
| ← thiago_home left | 02:21 |
| s1kx- → S1kx | 02:21 |
| → ispeak joined | 02:21 |
| → shuffle2 joined | 02:22 |
| → j416 joined | 02:26 |
| → VVSiz_ joined | 02:26 |
| ← khmarbaise left | 02:27 |
| → defectiv joined | 02:27 |
| ← imajes left | 02:29 |
| → sanity joined | 02:31 |
| ← kukks left | 02:33 |
| ← VVSiz left | 02:33 |
| ← shuffle2 left | 02:40 |
| → project2501a joined | 02:44 |
| ← schambers left | 02:44 |
| → shuffle2 joined | 02:46 |
| ngw → ngw|away | 02:48 |
| ngw|away → ngw | 02:48 |
| ← j416 left | 02:49 |
| ← loincloth left | 02:49 |
| → loincloth joined | 02:50 |
| ← Paraselene_ left | 02:51 |
| → kpreid_ joined | 02:53 |
| → aconbere joined | 02:57 |
| ← loincloth left | 03:01 |
| jbrennan_ → jbrennan | 03:05 |
| ← godsflaw left | 03:06 |
| → godsflaw joined | 03:06 |
| → FunkeeMonk joined | 03:08 |
| ← project2501a left | 03:10 |
| ← engla left | 03:10 |
| → ajonat joined | 03:12 |
| ngw → ngw|away | 03:13 |
| ngw|away → ngw | 03:13 |
| ← defectiv left | 03:17 |
| → gdrage joined | 03:18 |
| ← FunkeeMonk left | 03:20 |
| → cytrinox_ joined | 03:20 |
| ← parasti left | 03:22 |
| ← ispeak left | 03:27 |
| ← Pupeno left | 03:32 |
| → hipe joined | 03:32 |
| ← gdrage left | 03:36 |
| ← cytrinox left | 03:36 |
| cytrinox_ → cytrinox | 03:36 |
| → loinclot_ joined | 03:38 |
| → ereslibre_laptop joined | 03:41 |
| → ron__ joined | 03:43 |
| ← JayM left | 03:47 |
| ← ajonat left | 03:51 |
| → dys` joined | 03:57 |
| → ispeak joined | 04:00 |
| ← ispeak left | 04:00 |
| ← loinclot_ left | 04:01 |
| ← ron_ left | 04:02 |
| ← ngw left | 04:03 |
| → neelam joined | 04:04 |
| ← dys left | 04:09 |
| ← neelam left | 04:10 |
| → godsflaw_ joined | 04:17 |
| ← godsflaw_ left | 04:20 |
| ← godsflaw left | 04:22 |
| ← kpreid_ left | 04:25 |
| ← hipe left | 04:27 |
| → erikeldridge joined | 04:30 |
| → bluebits joined | 04:30 |
| ← erikeldridge left | 04:31 |
| ← sanity left | 04:34 |
| ← ereslibre left | 04:34 |
| → ereslibre joined | 04:34 |
| ← bbits left | 04:35 |
| → JayM joined | 04:35 |
| → bbits joined | 04:35 |
| ← LiamH left | 04:38 |
| → tommd joined | 04:42 |
|
tommd
| A simple git question: How do I combine two or more patches on my local repo into a single patch so I can format-patch and upstream just the one? | 04:43 |
|
wereHamster
| tommd: rebase -i and squash the two commits | 04:44 |
|
| s/two/ | 04:44 |
|
| s/two// | 04:44 |
| ← cbreak left | 04:46 |
| → cbreak joined | 04:46 |
| → mentor joined | 04:47 |
| ← bluebits left | 04:47 |
| → bluebits joined | 04:47 |
|
mentor
| I've got merge conflicts. I've been manually merging them (in the working state, not committed), but I've now released that I made a mistake in one file; how do I got back to the conflicted state? | 04:48 |
| → rchavik joined | 04:49 |
|
wereHamster
| mentor: git checkout --conflict -- file | 04:51 |
|
mentor
| Need to specify the merge style, but that's it; thanks. | 04:52 |
|
| Sorry, I lie, that has not wroked | 04:54 |
|
wereHamster
| or checkout --merge -- file | 04:55 |
| ← bbits left | 04:55 |
|
wereHamster
| I think when using --conflict you have to specify the style (--coflict=<style>) | 04:56 |
|
mentor
| :/ | 04:57 |
|
| :p | 04:57 |
|
| aha, I've fucked myself by doing something else earlier | 04:58 |
| ← shuffle2 left | 05:04 |
|
tommd
| wereHamster: Thank you, but I really don't understand git as well as I should. 'squash' two commits together doesn't seem to be slang here - it has a particular meaning? 'git rebase -i' needs more and doesn't accept something so trivial as a list of patches and a branch to base them on. | 05:06 |
|
wereHamster
| I assumed you knew how git rebase works | 05:08 |
|
tommd
| :-) Yeah, I'm going through man pages now. Thanks for the kick-start. | 05:09 |
| → kpreid_ joined | 05:10 |
|
wereHamster
| basically, git rebase -i <first commit you want to edit>^, that will pop up an editor, there you can reorder/edit/squash commits, save and exit the editor and git does its work | 05:11 |
|
| gitready has an article about rebase, as does the git book | 05:11 |
|
tommd
| I'll hunt them down (or learn the hard way...) | 05:12 |
|
| Thanks | 05:12 |
| ← ereslibre_laptop left | 05:12 |
| → Fissure joined | 05:15 |
| → hyperair joined | 05:16 |
| ← Jak_o_Shadows left | 05:19 |
| → numberGrey joined | 05:23 |
| → project2501a joined | 05:25 |
| → catalis joined | 05:29 |
| ← patrikf left | 05:43 |
| → tedoc2000 joined | 05:46 |
| ← catalis left | 05:46 |
| → piroko joined | 05:46 |
| → catalis joined | 05:46 |
| ← catalis left | 05:47 |
| → crab joined | 05:50 |
| ← bluebits left | 06:01 |
| → gebi joined | 06:04 |
| → bluebits joined | 06:04 |
| ← madewokherd left | 06:04 |
| ← tedoc2000 left | 06:04 |
| → munichlinux joined | 06:05 |
| → loincloth joined | 06:11 |
| → schmukkk joined | 06:13 |
| ← schmukkk left | 06:14 |
| → schmukkk joined | 06:15 |
| → chalkbag joined | 06:31 |
| → sh1mmer joined | 06:31 |
| → meanburrito920_ joined | 06:34 |
| ← cannonball left | 06:35 |
| ← __iron left | 06:40 |
| → rudi_s joined | 06:46 |
| ron__ → ron_ | 06:47 |
| ← rudi_s_ left | 06:48 |
| ← meanburrito920_ left | 06:48 |
| ← JakeSays left | 06:52 |
| → JakeSays joined | 06:52 |
| ← sh1mmer left | 06:56 |
| → loinclot_ joined | 06:57 |
| → justin__ joined | 07:03 |
|
justin__
| anyone here? | 07:05 |
|
bob2
| lots o people | 07:06 |
|
justin__
| why all silent .... | 07:06 |
|
bob2
| that's how irc works | 07:07 |
|
| sometimes there's lots of chatter, sometimes there's none | 07:07 |
|
justin__
| lol | 07:07 |
| ← datechman left | 07:08 |
| → datechman joined | 07:11 |
| ← loincloth left | 07:14 |
| ← gebi left | 07:16 |
| ← datechman left | 07:21 |
| → datechman joined | 07:22 |
| → vbgunz joined | 07:24 |
| → incredible joined | 07:25 |
| → keystr0k joined | 07:31 |
| ← datechman left | 07:32 |
| → mtkd joined | 07:32 |
| → datechman joined | 07:33 |
| ← datechman left | 07:34 |
| → datechman joined | 07:36 |
| → nitrate joined | 07:37 |
| → quizme joined | 07:39 |
| → vbgunz_ joined | 07:43 |
| ← vbgunz left | 07:44 |
| ← exygen left | 07:49 |
| ← nitrate left | 07:52 |
| → sis joined | 07:52 |
| ← keystr0k left | 07:55 |
| → nitrate joined | 07:57 |
| → brizly joined | 07:59 |
| → nitrate_ joined | 08:02 |
| → snearch_ joined | 08:04 |
| → r11t joined | 08:08 |
| ← up_the_irons left | 08:09 |
| ← snearch_ left | 08:10 |
| ← mbernstein left | 08:13 |
| → Sonderblade joined | 08:15 |
| ← nitrate left | 08:16 |
| ← Twisted_Mentat left | 08:16 |
| → nitrate__ joined | 08:18 |
| ← nitrate_ left | 08:18 |
| → babilen joined | 08:23 |
| → up_the_irons joined | 08:23 |
| → hipe joined | 08:25 |
| ← hyperair left | 08:26 |
| → droden joined | 08:26 |
| → hyperair joined | 08:29 |
| → Pupeno joined | 08:30 |
| → hohum joined | 08:32 |
|
hohum
| how do I give someone access to push to my repo? | 08:32 |
|
voker57
| use ssh and maybe some script like gitosis for rights management | 08:34 |
|
hohum
| the user I want to give repo access to is local to the machine | 08:34 |
|
voker57
| create user group with two of you, give repo to group, set up shared repo | 08:35 |
|
| means "sharedrepository = 1" in config | 08:35 |
| → tekky joined | 08:39 |
|
hohum
| okay | 08:41 |
|
| well | 08:41 |
|
| I just did a "git push <path to original repo>" from the other user's directory | 08:42 |
|
| and it didn't work | 08:42 |
|
| I don't see any of the files I added from that user | 08:42 |
|
voker57
| pastebin the error message | 08:42 |
|
hohum
| there is no error message | 08:42 |
|
| [acorbe@apollo ~/danos]$ git push /usr/home/dcorbe/danos | 08:42 |
|
| Everything up-to-date | 08:42 |
| ← QshelTier left | 08:42 |
|
hohum
| but I don't see any of my recent adds or commits | 08:42 |
|
voker57
| check if you are on right branch etc | 08:43 |
|
hohum
| I didn't make any branches | 08:43 |
|
bob2
| push will not update the working copy | 08:43 |
|
| (as the faq says, with rationale | 08:44 |
|
hohum
| all I did was init a new repo with group permissions | 08:44 |
|
bob2
| ) | 08:44 |
|
| perhaps that's what is tripping you up? | 08:44 |
|
hohum
| make some changes as a different user | 08:44 |
|
| it should update the copy I tell it to update, no? | 08:44 |
|
| pull updates the working copy | 08:44 |
|
| *sigh* | 08:45 |
| → drizzd joined | 08:45 |
|
hohum
| why is this so hard | 08:45 |
|
| I'm not trying to update a working copy | 08:47 |
|
| I'm trying to update the original repo | 08:47 |
|
| I do a git clone /usr/home/dcorbe/danos | 08:47 |
|
| edit some crap | 08:47 |
|
| did an add | 08:47 |
|
| git commit | 08:48 |
|
| git push /usr/home/dcorbe/danos | 08:48 |
|
| no errors | 08:48 |
|
| I expect to see my changes in /usr/home/dcorbe/danos | 08:48 |
|
| and I do not | 08:48 |
|
| why? | 08:48 |
|
| hmm | 08:49 |
| → cedric_ joined | 08:49 |
|
hohum
| ... | 08:49 |
|
| what am I missing? | 08:49 |
|
| I missing a step obviously | 08:49 |
|
| hello? | 08:50 |
| → vivien joined | 08:51 |
| ← cedricv left | 08:51 |
|
hohum
| well | 08:53 |
|
bob2
| and you mean that "cd /usr/home/dcorbe/danos ; git log " does not show the changes? | 08:53 |
|
hohum
| cvs it is then | 08:53 |
|
| er | 08:53 |
|
| yes | 08:53 |
| → nitrate_ joined | 08:53 |
|
hohum
| I see the changes when I do a git log | 08:53 |
|
bob2
| so, the problem IS that the working copy isn't being updated? | 08:53 |
|
| http://git.or.cz/gitwiki/GitFaq#Whywon.27tIseechangesintheremoterepoafter.22gitpush.22.3F | 08:54 |
|
hohum
| I think I see why I fail at life ;) | 08:54 |
| ← nitrate__ left | 08:54 |
| ← sis left | 08:55 |
| ← vbgunz_ left | 08:57 |
| ← xlistener left | 08:58 |
| → d0k joined | 08:59 |
| ← aconbere left | 09:02 |
| → __iron joined | 09:02 |
| ← tekky left | 09:06 |
| → Axius joined | 09:08 |
|
cxreg
| i think this channel gets questions about pushing into non-bare repos like 5 times every day | 09:08 |
| ← Axius left | 09:09 |
| VVSiz_ → VVSiz | 09:09 |
|
gitster
| perhaps time to update /title to refer to a faq (perhaps mothership-satellite section)? | 09:10 |
| dys` → dys | 09:11 |
|
cxreg
| what ever happened to dscho's patch that would update the checkout on push? | 09:12 |
|
| was it sufficiently scary to not merge? | 09:12 |
|
gitster
| if you have to ask, it probably wasn't ready. | 09:13 |
|
cxreg
| i wasn't sure if it simply wasnt ready, or if you rejected it on principle | 09:13 |
| → xsist10 joined | 09:15 |
| ← univate_ left | 09:15 |
| → Axius joined | 09:16 |
| → univate_ joined | 09:16 |
| → maxter joined | 09:21 |
| → solofight joined | 09:25 |
| ← r11t left | 09:27 |
| → r11t joined | 09:27 |
|
gitster
| No useful patch is rejected "on principle". If a patch is useful for some but hurts others (either "users with other workflows" or "limits our choice in future enhancement"), I may call that a "hack", and it may need polishing to round the edges that hurt others until it gets in. In that case, it is "not ready" until that polishing happens. | 09:27 |
| → bousquet joined | 09:28 |
|
cxreg
| Right, makes sense. I found the original post, and I think he was being snarky | 09:28 |
|
| [DRY HUMOR PATCH] Add a few more values for receive.denyCurrentBranch | 09:29 |
|
| where the value is 'updateInstead' | 09:29 |
|
| though later, people mentioned that they were using it and found it genuinely interesting | 09:29 |
| ← hyperair left | 09:29 |
|
gitster
| I don't recall I ever finding any of Dscho's patch "scary". Often his patches are not that intrusive, and sometimes I find them not sufficiently intrusive when a bit more intrusiveness would give them tighter and better integration. | 09:30 |
| → hyperair joined | 09:30 |
| → hobodave joined | 09:30 |
| → Twisted_Mentat joined | 09:30 |
|
cxreg
| he seems a bit self deprecating | 09:30 |
|
gitster
| Or being too busy. | 09:31 |
|
| Nobody stops others including you to pick up the remains and help polishing them, though. | 09:31 |
| ← agib left | 09:32 |
| → ph^_ joined | 09:32 |
|
cxreg
| I don't personally care much about the feature, but it comes up very often among newbies | 09:32 |
| → mbroeker joined | 09:32 |
| → munichpython joined | 09:35 |
| ← metze left | 09:37 |
| ← r11t left | 09:39 |
| → r11t joined | 09:40 |
| ← r11t left | 09:40 |
| ← munichlinux left | 09:40 |
| ← Axius left | 09:42 |
| ← amirite left | 09:44 |
| → _gpg_ joined | 09:44 |
|
_gpg_
| hello | 09:45 |
|
| merry christmas | 09:45 |
| → fcuk112 joined | 09:45 |
|
jjuran
| It's still Christmas in Hawaii, isn't it. | 09:46 |
| → nitrate__ joined | 09:47 |
|
jjuran
| And a happy December 26 to everyone else. | 09:47 |
| ← xsist10 left | 09:47 |
| → ankit9 joined | 09:50 |
| ← nitrate_ left | 09:52 |
| ← vivien left | 09:59 |
| → Chillance joined | 10:00 |
| ← jessep left | 10:02 |
| → vivien joined | 10:02 |
| ← vivien left | 10:03 |
| ← munichpython left | 10:04 |
| → munichpython joined | 10:04 |
| ← owen1 left | 10:04 |
| → vivien joined | 10:05 |
| → sgh joined | 10:07 |
|
Ilari
| Whatever happened to that patch that fixed the couple of nits in last round of smart remote helpers? Just got lost somewhere? | 10:08 |
| ← vivien left | 10:09 |
| → lucsky joined | 10:11 |
| ← bousquet left | 10:11 |
| → metze joined | 10:13 |
| → khmarbaise joined | 10:16 |
| ← ToxicFrog left | 10:17 |
| → Axius joined | 10:17 |
| ← justin__ left | 10:24 |
| ← nitrate__ left | 10:25 |
| → nitrate__ joined | 10:26 |
| → Sky[x] joined | 10:27 |
| → gebi joined | 10:28 |
| ← Axius left | 10:29 |
| → nitrate_ joined | 10:30 |
| ← quizme left | 10:35 |
| → vivien joined | 10:36 |
| ← nitrate_ left | 10:37 |
| ← vivien left | 10:37 |
| → engla joined | 10:38 |
| → vivien joined | 10:38 |
| → owen1 joined | 10:38 |
| ← solofight left | 10:39 |
| → nitrate joined | 10:40 |
| → ngw joined | 10:41 |
| → fcuk112_ joined | 10:42 |
| ← fcuk112_ left | 10:45 |
| ← nitrate__ left | 10:45 |
| → nitrate_ joined | 10:45 |
| → brizly1 joined | 10:46 |
| ← nitrate left | 10:47 |
| ← ankit9 left | 10:47 |
| → nitrate__ joined | 10:49 |
| → ixti joined | 10:50 |
| → fcuk112_ joined | 10:50 |
| ← schmukkk left | 10:51 |
| → nitrate joined | 10:51 |
| ← fcuk112 left | 10:51 |
| ← nitrate__ left | 10:53 |
| → intripoon joined | 10:54 |
| ← nitrate_ left | 10:57 |
| munichpython → munichlinux | 10:57 |
| ← Eren left | 10:57 |
| → calin joined | 10:59 |
| → Axius joined | 10:59 |
| ← brizly left | 10:59 |
| → hummingkid joined | 11:00 |
| → pantsman joined | 11:01 |
| → nitrate_ joined | 11:03 |
| ← nitrate left | 11:04 |
| ngw → ngw|away | 11:05 |
| ← mtkd left | 11:06 |
| → mtkd joined | 11:07 |
| ← Twisted_Mentat left | 11:09 |
| ngw|away → ngw | 11:20 |
| → j416 joined | 11:20 |
| → nitrate__ joined | 11:22 |
| ← nitrate_ left | 11:24 |
| ← Sonderblade left | 11:24 |
| → nitrate_ joined | 11:25 |
| ← drizzd left | 11:26 |
| → nitrate joined | 11:29 |
| → imajes joined | 11:30 |
| → icwiener joined | 11:31 |
| ← gebi left | 11:31 |
| ← nitrate_ left | 11:32 |
| ← sgh left | 11:34 |
| ← nitrate left | 11:34 |
| ← pantsman left | 11:36 |
| → nitrate joined | 11:36 |
| ← nitrate__ left | 11:38 |
| → nitrate_ joined | 11:38 |
| ← Axius left | 11:39 |
| → ivan joined | 11:40 |
| → pantsman joined | 11:40 |
| ← nitrate left | 11:41 |
| ← j416 left | 11:44 |
| ← nitrate_ left | 11:46 |
| ← munichlinux left | 11:47 |
| → aziz joined | 11:52 |
| → nitrate_ joined | 11:55 |
| → gebi joined | 11:55 |
| ← imajes left | 11:57 |
| → soreau joined | 11:58 |
|
soreau
| Hello, I was wondering if there's any way to see when the last time one single line of code has changed in the past, like when was the last time it changed | 11:59 |
|
| or was initially added.. is that possible with git? | 11:59 |
| → nitrate joined | 12:00 |
| ← pantsman left | 12:00 |
|
teuf
| soreau: git annotate toto.c | 12:01 |
| → nitrate__ joined | 12:01 |
| ← nitrate left | 12:03 |
|
felipec
| teuf: it's git blame | 12:03 |
| ← TDJACR left | 12:03 |
| → TDJACR joined | 12:04 |
|
teuf
| felipec: both give mostly the same output | 12:04 |
|
felipec
| teuf: yeah, because git annotate is an alias to git blame | 12:05 |
|
soreau
| Thanks teuf felipec | 12:08 |
| ← soreau left | 12:08 |
| → kiko_ joined | 12:09 |
| ← selckin left | 12:10 |
| ← engla left | 12:11 |
| ← nanothief left | 12:11 |
|
kiko_
| hi, In .gitignore, how can I tell ignore .config/ but not .config/foo/ ? tried .config/ and !.config/foo/ but seems it still ignored. | 12:12 |
|
nevyn
| hrm | 12:12 |
|
felipec
| kiko_: how about .config$ ? | 12:13 |
| ← nitrate_ left | 12:13 |
|
kiko_
| felipec: seems whole .config is not ignored with .config$ | 12:17 |
|
felipec
| kiko_: all, right, only .config would be ignored, not .config/bar | 12:18 |
| → imajes joined | 12:18 |
|
felipec
| kiko_: then maybe .config/(^foo) | 12:18 |
|
wereHamster
| kiko_: why do you think .config/ and !.config/foo/ doesn't work? | 12:19 |
|
kiko_
| wereHamster: I'm judging by git status not showing .config/foo/* as untracked file. Am I misunderstanding here already? | 12:21 |
| ← hobodave left | 12:26 |
| ← rchavik left | 12:27 |
| → thiago_home joined | 12:30 |
| → stamina_ joined | 12:32 |
| → engla joined | 12:39 |
| ← cedric_ left | 12:41 |
| → partisan joined | 12:46 |
| ← calin left | 12:52 |
| ← partisan left | 12:53 |
| → Paraselene_ joined | 13:00 |
| → malumalu joined | 13:01 |
| ← Octalot left | 13:02 |
| → kmap joined | 13:03 |
| ← felipec left | 13:04 |
| ngw → ngw|away | 13:07 |
|
Adlai
| I'm having trouble getting get-send-email to send a few patches. I found http://morefedora.blogspot.com/2009/02/configuring-git-send-email-to-use-gmail.html and followed that, but now I get: Can't locate Net/SMTP/SSL.pm in @INC (@INC contains: [snip]) at /usr/lib/git-core/git-send-email line 944, <FIN> line 3. | 13:07 |
| → munichlinux joined | 13:08 |
| ← imajes left | 13:09 |
| ngw|away → ngw | 13:10 |
| ← khmarbaise left | 13:12 |
|
wereHamster
| Adlai: how did you install git (or git send-email)? | 13:12 |
|
Adlai
| wereHamster, through my distro's package manager. I'm on Archlinux so that would be pacman. | 13:12 |
|
wereHamster
| hm, you should contact the packager that he has a missing dependency | 13:13 |
|
Adlai
| git-send-email was installed as part of the git package | 13:13 |
|
wereHamster
| but the packager didn't make sure that Net/SMTP/SSL.pm is installed before installing git | 13:14 |
|
| see if you can install that perl package somehow | 13:15 |
|
Adlai
| I think I got it. I got prompted for a password, entered it, and then: Need MIME::Base64 and Authen::SASL todo auth at /usr/lib/git-core/git-send-email line 981, <STDIN> line 1. | 13:16 |
| ← incredible left | 13:18 |
| → incredible joined | 13:19 |
| → khmarbaise joined | 13:20 |
| → keystr0k joined | 13:23 |
| ← project2501a left | 13:24 |
| ← malumalu left | 13:25 |
| → malumalu joined | 13:25 |
| ← munichlinux left | 13:27 |
| ← hummingkid left | 13:30 |
| ← hyperair left | 13:30 |
| → hyperair joined | 13:30 |
| ← zackattack left | 13:31 |
| → archis joined | 13:33 |
| ← Pupeno left | 13:34 |
| ← archis left | 13:34 |
| ← kmap left | 13:36 |
| → Axius joined | 13:38 |
|
Adlai
| wereHamster, looks like I'm good. Had to dig around in the pacman packages get one more module (Authen::SASL) and now my patches are sent. :) | 13:39 |
| → hummingkid joined | 13:41 |
| ← TDJACR left | 13:44 |
| ← thiago_home left | 13:45 |
| → vbgunz_ joined | 13:47 |
| ← khmarbaise left | 13:48 |
| ← orafu left | 13:53 |
| ← vivien left | 13:53 |
| → orafu joined | 13:53 |
| → vivien joined | 13:53 |
| ← aresnick left | 13:57 |
| ← Axius left | 13:58 |
| → khmarbaise joined | 13:59 |
| → mbernstein joined | 14:00 |
| → selckin joined | 14:01 |
| → klickverbot joined | 14:02 |
| → kain__ joined | 14:03 |
| → aresnick joined | 14:04 |
|
kain__
| hi there. how to clone a repository 'stopping' at a specific commit/sha ? | 14:04 |
| → Axius joined | 14:04 |
| → ereslibre_laptop joined | 14:05 |
|
kain__
| git checkout rev would suffice? | 14:06 |
| → catalis joined | 14:08 |
| ← Axius left | 14:08 |
| ← kain__ left | 14:09 |
| ← klickverbot left | 14:10 |
| → Turias joined | 14:14 |
| → idletask joined | 14:17 |
|
idletask
| Hello | 14:17 |
| → shadeslayer joined | 14:17 |
|
idletask
| What exactly is the use of having a HEAD pointer on a remote repository? When you add a remote, there's no such pointer unless you git remote set-head | 14:17 |
|
| What is this for exactly? | 14:18 |
|
shadeslayer
| hi suppose on gitorious.org i want to pull from the mainline branch and merge the latest source on my clone,whats the command? | 14:18 |
| → tibra joined | 14:18 |
|
idletask
| shadeslayer: do you already have a tracking branch for that mainline branch? | 14:18 |
|
tibra
| hi everyone | 14:18 |
|
shadeslayer
| idletask: tracking branch? like the url? | 14:19 |
|
| idletask: i have 2 copies of the project,one on which i work on and the second which has the latest code | 14:19 |
|
idletask
| shadeslayer: no - a local branch that is set up to track a remote branch. When you have cloned the repository initially, the master branch has been set up as a tracking branch for origin/master | 14:20 |
|
| shadeslayer: and you needn't have two copies | 14:20 |
|
tibra
| i've just installed a new git on a shared host. now trying to push a rails app over from local to that shared host, everytime that ssh asks me for "password", I can't get further, cause I am getting blocked by my server after this. is this a git issue or ssh? | 14:20 |
|
shadeslayer
| idletask: um for the merge requests i need just one copy? | 14:20 |
|
idletask
| Yes | 14:20 |
| → TDJACR joined | 14:20 |
|
idletask
| You simply add the necessary remotes | 14:21 |
|
shadeslayer
| idletask: ok i have my own clone copy on the HD,i havent set it up to follow any branch | 14:21 |
|
idletask
| shadeslayer: if you have cloned from gitorious, you _do_ have a tracking branch - master | 14:21 |
|
| See above | 14:21 |
| → robinr joined | 14:21 |
|
shadeslayer
| idletask: yeah | 14:22 |
|
idletask
| shadeslayer: hold on, I'll pastebin an example | 14:23 |
|
shadeslayer
| idletask: ok sure :) | 14:23 |
| → roop joined | 14:24 |
|
shadeslayer
| im kinda new to revision systems... i set one up a few months ago.. forgot how i did it | 14:24 |
| → parasti joined | 14:26 |
| → ehabkost joined | 14:27 |
|
shadeslayer
| idletask: there? | 14:30 |
|
idletask
| shadeslayer: http://pastebin.com/m569d2f1a | 14:33 |
|
| shadeslayer: in fact, the example I give is a rebase, not a merge, but it's easier for maintainers when you do a push request | 14:33 |
|
| A pull request, sorry | 14:33 |
|
| shadeslayer: it's a good idea to rebase regularly, too: if there are conflicts, they will be easier to solve | 14:35 |
|
| It's the developers' work to resolve conflicts, not the maintainers' :p | 14:35 |
|
shadeslayer
| :D | 14:35 |
|
idletask
| shadeslayer: but as you can see, there is no need to have two copies, one is enough | 14:36 |
|
| You just need to add the necessary remote repositories | 14:36 |
|
| shadeslayer: also, you may want to have a different namespace, so adapt the commands (you can rename remotes, branches, etc) | 14:37 |
|
shadeslayer
| idletask: ok suppose i have my clone in gitorious,i cant create a branch on the mainline repo | 14:37 |
|
idletask
| You very probably can't, unless you're a maintainer on the main repo | 14:37 |
|
shadeslayer
| how do i update my clone on git with the lastest source from mainline then? | 14:37 |
|
| idletask: no im not the maintainer of the main repo,i have a seprate clone | 14:38 |
|
| idletask: like this is the main repo : http://gitorious.org/rekonq : and my clone is : http://gitorious.org/~shadeslayer/rekonq/shadeslayers-clone-docs | 14:38 |
|
idletask
| Add the mainline repo as a remote, fetch from it, create a tracking branch for the master branch and merge it regularly with your clone's master branch | 14:38 |
| → zackattack joined | 14:39 |
| → tibra_ joined | 14:39 |
|
shadeslayer
| idletask: lines 1-10? | 14:39 |
|
idletask
| shadeslayer: OK, I'll adapt the pastebin to show you, but this will take a little time :p | 14:39 |
| ← ereslibre_laptop left | 14:39 |
|
idletask
| And I need a coffee | 14:40 |
|
shadeslayer
| idletask: um can you mail it to me? im running out of time :P | 14:40 |
| ← tibra_ left | 14:40 |
|
idletask
| shadeslayer: I can, just /privmsg me your mail | 14:40 |
| → pantsman joined | 14:41 |
|
shadeslayer
| bye all | 14:41 |
|
| thanks :D | 14:41 |
| ← shadeslayer left | 14:41 |
| → tibra_ joined | 14:41 |
| ← zackattack left | 14:42 |
| → kukks joined | 14:43 |
| ← pantsman left | 14:47 |
| ← robinr left | 14:48 |
| → LiamH joined | 14:48 |
| ← tibra left | 14:48 |
| tibra_ → tibra | 14:48 |
| → RaceCondition joined | 14:49 |
| → gambler joined | 14:51 |
| → robinr joined | 14:52 |
| ← __iron left | 14:56 |
| → __iron joined | 15:03 |
| ← robinr left | 15:04 |
| → yaotti_aw joined | 15:05 |
| → madewokherd joined | 15:06 |
| → tibra_ joined | 15:07 |
| ← tibra left | 15:07 |
| tibra_ → tibra | 15:07 |
| → whaley joined | 15:12 |
| → developernotes joined | 15:13 |
| ← developernotes left | 15:14 |
| ← roop left | 15:16 |
| ← incredible left | 15:16 |
| → incredible joined | 15:16 |
| → tvw joined | 15:18 |
| → ereslibre_laptop joined | 15:19 |
| ← ereslibre left | 15:21 |
| ← catalis left | 15:22 |
| → reprore joined | 15:27 |
| ← _gpg_ left | 15:28 |
| → pantsman joined | 15:28 |
| ← Xeross left | 15:35 |
| → Xeross_ joined | 15:35 |
| ← tibra left | 15:35 |
| ← d0k left | 15:37 |
| → sanity joined | 15:37 |
| → sgh joined | 15:37 |
| ngw → ngw|away | 15:39 |
| → vals_ joined | 15:42 |
| → catalis joined | 15:43 |
| ← hyperair left | 15:44 |
| ← pantsman left | 15:44 |
| → hyperair joined | 15:46 |
| ← tango_ left | 15:47 |
| → Turias1 joined | 15:50 |
| ← Turias left | 15:50 |
| → tibra joined | 15:52 |
| ← whaley left | 15:53 |
| ← mithro left | 15:54 |
| → aspotashev_ joined | 15:54 |
| vals_ → tango_ | 15:55 |
| ← tibra left | 15:56 |
| ← aziz left | 15:56 |
| → tibra joined | 15:57 |
| ← stamina_ left | 15:57 |
| → thiago_home joined | 15:58 |
| ← tibra left | 15:58 |
| → tedoc2000 joined | 15:59 |
| → partisan joined | 16:00 |
| → aziz joined | 16:01 |
| → Alagar joined | 16:02 |
| ngw|away → ngw | 16:04 |
| ← catalis left | 16:05 |
| → godsflaw joined | 16:05 |
| ← gebi left | 16:05 |
| ← xenoterracide left | 16:06 |
| ← aspotashev left | 16:07 |
| → xenoterracide joined | 16:08 |
| → Adlai` joined | 16:10 |
| ← Adlai left | 16:10 |
| Adlai` → Adlai | 16:11 |
| → incredib1e joined | 16:11 |
| ngw → ngw|away | 16:15 |
| incredib1e → incredible_test | 16:16 |
| ngw|away → ngw | 16:24 |
| ← godsflaw left | 16:26 |
| ← datechman left | 16:27 |
| ngw → ngw|away | 16:27 |
| → AAA_awright_ joined | 16:28 |
| → nothingHappens joined | 16:30 |
| → cloudhead joined | 16:32 |
| ← tvw left | 16:32 |
| ← mtkd left | 16:33 |
| → datechman joined | 16:34 |
| ← AAA_awright left | 16:34 |
| → developernotes joined | 16:34 |
| ← developernotes left | 16:34 |
| → tbuehlmann joined | 16:35 |
| → idle_task joined | 16:40 |
| ← Turias1 left | 16:40 |
| ← engla left | 16:41 |
| loinclot_ → loincloth | 16:42 |
| ← sgh left | 16:42 |
| → Yuuhi joined | 16:43 |
| ← voker57 left | 16:45 |
| ereslibre_laptop → ereslibre | 16:45 |
| → catalis joined | 16:50 |
| ← catalis left | 16:51 |
| → TML joined | 16:52 |
| ← idletask left | 16:53 |
| idle_task → idletask | 16:58 |
| → schacon joined | 16:59 |
| ← kpreid_ left | 17:01 |
| ← keystr0k left | 17:01 |
| → MrC joined | 17:05 |
| → jceb joined | 17:09 |
| ← schacon left | 17:11 |
| → tibra joined | 17:20 |
| ← nothingHappens left | 17:22 |
| → nothingHappens joined | 17:22 |
| ← tedoc2000 left | 17:23 |
| ← aspotashev_ left | 17:24 |
|
idletask
| If anyone is alive, I'd like an explanation... What is the origin/HEAD for when you list remote branches, and why, on added remotes, isn't there such a HEAD defined? | 17:25 |
|
thiago_home
| origin/HEAD is origin's HEAD | 17:28 |
|
| it exists if the remote has it | 17:29 |
|
| though I think pull/fetch doesn't add it | 17:29 |
|
idletask
| thiago_home: and what purpose does it serve? Is this for the clone operation? | 17:30 |
|
| idletask needs to check his assumption that such a HEAD never appears on other defined remotes even after fetching from them | 17:30 |
|
idletask
| Well, I can check that right now | 17:31 |
| ← ereslibre left | 17:31 |
|
idletask
| And I confirm | 17:31 |
|
| No HEAD in subsequent added remotes | 17:31 |
|
| subsequently, sorry | 17:33 |
| → keystr0k joined | 17:34 |
| ← keystr0k left | 17:34 |
| ← vbgunz_ left | 17:35 |
|
thiago_home
| when you clone, you check out the same branch that the remote has as HEAD | 17:36 |
|
idletask
| thiago_home: OK, that's what I figured | 17:38 |
|
| That probably explains why HEAD is not defined on other remotes you add | 17:38 |
|
thiago_home
| yeah | 17:39 |
| ← malumalu left | 17:39 |
|
idletask
| Hmm, I have noticed what I think is a bug, probably - here, I'm on a non tracking branch and try to git pull: http://pastebin.com/m52627af9 | 17:40 |
|
| Look at line 2-4 | 17:40 |
|
| It tries to contact the remote without checking the configuration first | 17:41 |
|
Fissure
| pull runs fetch, which defaults to origin | 17:41 |
|
idletask
| Fissure: ... but does so without even checking whether the branch you are currently trying to pull is a tracking branch at all | 17:42 |
|
| As witnessed here | 17:42 |
| → ereslibre joined | 17:42 |
|
Fissure
| pull always updates all tracking refs for the remote, not just the one you're pulling | 17:43 |
|
idletask
| Yes I know | 17:43 |
|
| But that's not an excuse :p | 17:43 |
|
wereHamster
| except if you use 'git pull <remote> <branch> | 17:43 |
|
idletask
| wereHamster: in this particular case, I didn't | 17:43 |
|
Fissure
| wereHamster: for certain definitions of "always" ;) | 17:44 |
|
idletask
| imho, git should have detected the missing configuration before doing the fetch | 17:44 |
|
Fissure
| idletask: questionable design decision, maybe, but i'm not sure it's unintended | 17:45 |
| ← RaceCondition left | 17:48 |
|
incredible
| Hi! I try to run "git gui" but it says "git: 'gui' is not a git-command. See 'git --help'." I am using Ubuntu 9.10 (on VirtualBox from Win7) if that matters (but I think it doesn't). | 17:48 |
|
| gitk works splendid, but I wanted to try other interfaces as well... | 17:49 |
|
DrNick
| you probably have to install more git packages | 17:50 |
|
incredible
| I installed git-core (on Ubuntu) | 17:50 |
|
| Do I need something else? | 17:50 |
|
DrNick
| probably | 17:53 |
|
incredible
| DrNick: ok, thanks... I'll search (the ubuntu repositories)... | 17:54 |
|
wereHamster
| incredible: if you are on ubuntu, probably 'apt-get install git-gui' | 17:55 |
| → mjf joined | 17:58 |
|
incredible
| wereHamster: thank you vey much... now works like a charm :D thanks a lot :D | 17:58 |
|
doener
| idletask: origin/HEAD also works as a shortcut. It's a symref, to e.g. origin/master. And then you can say "git log origin/master", or "git log origin/HEAD", or (and that's the shortcut) just: git log origin | 17:59 |
|
| idletask: i.e. it kind of defines the "default" remote tracking branch for that remote | 18:00 |
|
incredible
| I think git gui won't work on Windows or am I wrong? | 18:00 |
|
doener
| idletask: and you can create/update such <remote>/HEAD symrefs using "git remote set-head ..." | 18:00 |
|
idletask
| doener: I have read about the set-head operation indeed | 18:01 |
| → exygen joined | 18:01 |
|
idletask
| doener: I need to reread the manpage in the light of what I have just learned | 18:01 |
|
doener
| idletask: so if you're mostly working with foo/topicX, you can say "git remote set-head foo topicX", and get foo/HEAD as a symref to foo/topicX. And then you can start using e.g. "git log foo" to save some typing | 18:02 |
|
idletask
| doener: I suppose there's a way to push that HEAD if you have push power on a remote? | 18:02 |
| ← incredible_test left | 18:02 |
|
idletask
| Well, "power" | 18:03 |
|
| You see what I mean | 18:03 |
| ngw|away → ngw | 18:03 |
|
doener
| idletask: you mean to update the "real" HEAD of the remote repo? No. | 18:05 |
|
| idletask: The name origin/HEAD (or whatever) is (to some degree) misleading | 18:06 |
| → ubitux joined | 18:06 |
|
ubitux
| hi | 18:06 |
|
idletask
| Ah | 18:06 |
|
| So, I indeed have other things to understand | 18:06 |
|
doener
| idletask: clone happens to set origin/HEAD to e.g. origin/master, when the remote's HEAD references the remote's refs/heads/master | 18:06 |
|
| idletask: but that's really the only "link" between origin/HEAD and origin's HEAD | 18:07 |
| → RaceCondition joined | 18:07 |
| → aconbere joined | 18:07 |
|
Fissure
| incredible: git-gui works fine on windows... i think tk looks better on windows than it does on linux, even | 18:07 |
| ngw → ngw|away | 18:07 |
|
| idletask opens the steam valve - his brains are overheating | 18:07 |
| ← ia left | 18:07 |
|
ubitux
| I've an issue with git bisect, it seems that the reset option does not work as I expected: http://pastie.org/757121 | 18:08 |
| → hobodave joined | 18:09 |
|
doener
| idletask: basically, just think of origin/HEAD as a convenience thing, it allows you to say "origin" instead of "origin/foo". But it has no connection to origin's HEAD, it's purely local | 18:09 |
|
ubitux
| can anyone explains this to me ? :/ | 18:09 |
|
wereHamster
| ubitux: what does 'git rev-parse master' say? | 18:09 |
|
ubitux
| 122b5696805a9a94cae16334ffe125dacb12a19b | 18:10 |
|
wereHamster
| ubitux: 'git bisect bad' == 'git bisect bad HEAD' and when you are on master it translates to 'git bisect bad 122...' | 18:10 |
|
| so you said that 122b.. is both good and bad | 18:11 |
|
incredible
| Fissure: thanks | 18:11 |
|
idletask
| doener: a side question maybe, but what happens on a clone when HEAD points to a branch with another name than master? | 18:11 |
|
| Say, foo | 18:11 |
|
ubitux
| oh I made a mistake, I though it was an old revision | 18:11 |
|
| sorry, thanks wereHamster | 18:11 |
|
idletask
| Will you have origin/HEAD pointing to origin/foo, and the initially checked branch being foo? | 18:11 |
| ← icwiener left | 18:12 |
|
doener
| idletask: right (in general, there are a few 'tricky' things, when the protocol can't transfer symrefs as symrefs [e.g. git://]) | 18:12 |
| ngw|away → ngw | 18:13 |
| → Archiloque joined | 18:14 |
| ← aconbere left | 18:18 |
| → idle_task joined | 18:18 |
|
idle_task
| Disconnected again | 18:18 |
|
| I "love" my Internet connection | 18:18 |
| ngw → ngw|away | 18:20 |
| → ia joined | 18:23 |
| → schmukkk joined | 18:24 |
| ngw|away → ngw | 18:24 |
| ← tibra left | 18:27 |
| yhager_ → yhager | 18:29 |
| ← idletask left | 18:31 |
|
idle_task
| http://qt.gitorious.org/qt-jambi/pages/GitGuide <-- anyone care to read up to "Old stuff below – don’t read, please…" and comment? :p | 18:31 |
| → voker57 joined | 18:34 |
| → brett_h joined | 18:35 |
| → Axius joined | 18:35 |
| ← doener left | 18:36 |
| → project2501a joined | 18:37 |
| → doener joined | 18:37 |
| ← ius left | 18:39 |
| ← babilen left | 18:39 |
| ngw → ngw|away | 18:39 |
| → babilen joined | 18:40 |
| → froschi1 joined | 18:41 |
|
teukka
| fyi: a simple vim syntax highlighting for gitolite.conf: http://www.vim.org/scripts/script.php?script_id=2900 | 18:41 |
|
MrC
| I've got a bare repository which I'm pushing my local commits to via SSH. The location is accessible with a webserver, so that others can clone the contents via HTTP. The setup worked great for several months, but now cloning over HTTP stopped working (curl_result=22, http_code=403). The Apache log shows some 404 errors. Any ideas how I could fix this? | 18:45 |
|
Fissure
| 403 is permission denied, yes? what happens if you try to navigate to the repo via a browser? | 18:49 |
|
MrC
| It shows the contents. | 18:50 |
|
| And yes, 403 is permission denied. | 18:50 |
| → ius joined | 18:50 |
| AAA_awright_ → AAA_awright | 18:50 |
|
selckin
| well figure out the 404s | 18:51 |
|
| some probably probably not readable anymore by apache | 18:52 |
|
| +files | 18:52 |
|
MrC
| It says it can't find objects/15/be897b73bd52d08cbc02f0716c680b26a16ec5 | 18:52 |
|
| Indeed, that file isn't there. | 18:52 |
| → d-snp joined | 18:52 |
|
MrC
| But it also isn't existing on my local branch. | 18:52 |
| ← tg left | 18:53 |
|
MrC
| After that, it looks for two files in objects/info: alternates and http-alternates. | 18:53 |
|
| Both not there. | 18:53 |
|
selckin
| do you run git-update-server-info after pushing? | 18:53 |
| → tg joined | 18:53 |
|
MrC
| Yes, I've got the hook enabled, but running it manually didn't solve the problem, either. | 18:53 |
| ← froschi left | 18:56 |
| ← Archiloque left | 18:56 |
|
Ilari
| MrC: Try 'git rev-list --all --objects >/dev/null' in remote bare repository and see if it complains about anything? | 18:57 |
| ← vivien left | 18:57 |
|
Ilari
| MrC: Better yet, instead of redirecting to /dev/null, grep the output for 15be897b73bd52d08c | 18:58 |
|
MrC
| No output | 18:59 |
|
| After grep, that is, of course. | 18:59 |
|
| Oh, no, wait.... | 18:59 |
|
| Typo | 19:00 |
|
| It found 15be897b73bd52d08cbc02f0716c680b26a16ec5 description | 19:00 |
|
Ilari
| MrC: 'git cat-file -t 15be897b73bd52d08cbc02f0716c68'? | 19:00 |
| → project2501b joined | 19:01 |
|
MrC
| Ilari: "blob" | 19:02 |
|
Ilari
| MrC: So since that ins't loose (it would show up with the filename you looked for) its packed... Wonder why that pack doesn't get fetched... | 19:03 |
|
| MrC: And 403 but apache logs show 404? 403's should show up in logs. | 19:03 |
| → bambule joined | 19:03 |
|
MrC
| Ilari: Just checked again, no single 403 in the Apache logs. | 19:05 |
| → ramlev joined | 19:07 |
| ← ramlev left | 19:07 |
| → ramlev joined | 19:07 |
| ← ramlev left | 19:07 |
| ← project2501a left | 19:08 |
| → HG` joined | 19:09 |
| → ankit9 joined | 19:09 |
| → FunkeeMonk joined | 19:10 |
| → icwiener joined | 19:10 |
|
idle_task
| So, no comments on my guide yet, it seems :p | 19:14 |
| → munichlinux joined | 19:15 |
| ← mjf left | 19:17 |
| ngw|away → ngw | 19:19 |
| ← kuber left | 19:19 |
| → pantsman joined | 19:19 |
| → kpreid_ joined | 19:20 |
| ← Lisimba left | 19:20 |
| → calin joined | 19:25 |
| → _gpg_ joined | 19:28 |
| Xeross_ → Xeross | 19:32 |
| ← hobodave left | 19:35 |
| → ehabkost_ joined | 19:36 |
| → jelmer_ joined | 19:37 |
| ← jelmer_ left | 19:37 |
| ← pantsman left | 19:41 |
| → Axius_ joined | 19:42 |
| ← brett_h left | 19:42 |
| → Twisted_Mentat joined | 19:43 |
| → jelmer_ joined | 19:43 |
| ← Axius left | 19:43 |
| ← jelmer left | 19:44 |
| jelmer_ → jelmer | 19:44 |
| → jelmer_ joined | 19:44 |
| → nullvariable joined | 19:46 |
| → malumalu joined | 19:46 |
| → DaveIngram joined | 19:47 |
| → rhett joined | 19:48 |
| → dreiss_ joined | 19:50 |
| ← ralf_e left | 19:50 |
| → sgh joined | 19:52 |
| ← ehabkost left | 19:53 |
|
gitster
| idle_task: given the audience and the disclaimer at the beginning of the document, I wouldn't expect you to get much feedback here on #git and it seems that comments on technical accuracy is discouraged, so I would refrain from commenting myself. | 19:54 |
| ← wolog left | 19:57 |
| ← Axius_ left | 19:57 |
| → wolog joined | 19:57 |
| → Axius joined | 19:58 |
| idle_task → idletask | 19:58 |
| ← hyperair left | 19:58 |
| → bugfux joined | 20:01 |
| → ToxicFrog joined | 20:02 |
|
idletask
| gitster: that makes sense | 20:03 |
|
| But I was rather asking for blatant errors | 20:03 |
| ← khmarbaise left | 20:06 |
|
gitster
| Other than an unqualified "tracking branch" that is a cause of confusion, I didn't spot any (I stopped reading at "please don't read" line). | 20:07 |
|
| Often people refer to refs under "refs/remotes" as "tracking branches" (dropping "remote" from "remote tracking branches") but that is not what you are describing there. | 20:09 |
|
thiago_home
| that's very confusing | 20:10 |
|
| local branches that track remote branches, the local copy of remote branches, the branches on the remote repository | 20:10 |
|
gitster
| Other people refer to local branches that builds on top of (meaning "pulls from and sometimes pushes to") branches they obtain from the remote (aka "remote tracking branches") "tracking branches". That is confusing as well. | 20:10 |
|
idletask
| Hmm, yes | 20:10 |
|
| I came up with "tracking branches" for lack of a better way of explaining things | 20:11 |
|
gitster
| If anything, they are "trailing" branches perhaps, but don't use that word (I've never seen anybody use that word to describe them). | 20:11 |
|
idletask
| But thiago_home has come up with something | 20:11 |
|
| "the local copy of remote branches" | 20:11 |
|
thiago_home
| do like the FSF: come up with new terms for everything | 20:11 |
|
idletask
| That's a more accurate description | 20:11 |
|
thiago_home
| lawyers love the "convey" in GPLv3 :-P | 20:11 |
| ← HG` left | 20:11 |
|
gitster
| I'd try not to say "tracking branches" to refer to either. For remote stuff I say "remote tracking branches" and for local "your own fork" is how I call them to avoid confusing. | 20:11 |
| ← reprore left | 20:12 |
| → hyperair joined | 20:12 |
|
idletask
| OK, I'll rework this part, but I need to gather my thoughts first | 20:12 |
|
| And of course, thanks for the feedback! | 20:12 |
|
thiago_home
| note that you can track another local branch | 20:14 |
|
gitster
| s/track/build on/ | 20:14 |
|
thiago_home
| yeah | 20:16 |
| → bluebug joined | 20:21 |
| → khmarbaise joined | 20:25 |
| ← FunkeeMonk left | 20:25 |
| → FunkeeMonk_ joined | 20:25 |
| FunkeeMonk_ → FunkeeMonk | 20:25 |
| ← kpreid_ left | 20:26 |
| ← ngw left | 20:27 |
| ← DaveIngram left | 20:27 |
| ← bluebug left | 20:29 |
| → Skolem joined | 20:29 |
|
Skolem
| Hey, I have a .git directory - how do I check out the latest version of all the files? I did "git checkout" but it just printed a bunch of lines beginning with 'D' | 20:30 |
|
Ilari
| Skolem: Sounds like $faq non-bare | 20:32 |
|
Gitbot
| Skolem: Pushing to non-bare repositories is discouraged. See http://git.or.cz/gitwiki/GitFaq#non-bare | 20:32 |
|
| charon admires Ilari's crystal ball | 20:33 |
|
Skolem
| Ilari, I'm taking that to mean I should search for the terms [non-bare repository] on Google. Thanks! | 20:34 |
| ← numberGrey left | 20:35 |
|
Ilari
| Skolem: Basically, don't push to checked out branch... | 20:35 |
|
Skolem
| I basically have the .git directory, but I deleted all the files outside of .git... I want to get them back | 20:36 |
|
| (deleted with /bin/rm, not with git) | 20:36 |
|
Ilari
| Skolem: 'git checkout -- .'? | 20:36 |
|
Skolem
| Ah, the '.' made all the difference. I'll have to re-read "git help checkout". Thanks a bunch, I'm all set now. | 20:37 |
| ← Axius left | 20:37 |
| ← FunkeeMonk left | 20:39 |
| ← sgh left | 20:40 |
| ← yhager left | 20:40 |
|
idletask
| Argh, this is not easy :/ | 20:42 |
| → Axius joined | 20:46 |
| ← jelmer left | 20:46 |
| ← Skolem left | 20:46 |
| ← bugfux left | 20:46 |
| ← munichlinux left | 20:47 |
| ← Axius left | 20:48 |
| → nanothief joined | 20:51 |
| ← incredible left | 20:51 |
| → Axius joined | 20:52 |
| → becomingGuru joined | 20:53 |
| → _Vi joined | 20:57 |
| ← Axius left | 20:59 |
| ← tg left | 21:00 |
| ← project2501b left | 21:00 |
| → tg` joined | 21:00 |
| ← Chillance left | 21:00 |
| → Axius joined | 21:02 |
| ← s0ber left | 21:05 |
| → AkumaStreak joined | 21:07 |
| ← Yuuhi left | 21:07 |
| → Karajan joined | 21:09 |
| → D[a]vey joined | 21:11 |
| ← jceb left | 21:11 |
| → yhager joined | 21:12 |
| → s0ber joined | 21:13 |
| ← ixti left | 21:13 |
| D[a]vey → Davey | 21:15 |
| shadowmaster → blahblah | 21:18 |
| ← Karajan left | 21:20 |
| ← _gpg_ left | 21:20 |
| blahblah → shadowm_laptop | 21:20 |
| shadowm_laptop → patchpatch | 21:21 |
| ← Axius left | 21:21 |
| patchpatch → shadowmaster | 21:23 |
| ← thiago_home left | 21:24 |
| → Lisimba joined | 21:25 |
| ← AkumaStreak left | 21:26 |
| → AkumaStreak joined | 21:26 |
| → Mathnerd314 joined | 21:27 |
| → xlistener joined | 21:27 |
| → bugfux joined | 21:27 |
| → aspotashev joined | 21:29 |
| → Axius joined | 21:32 |
| ← _Vi left | 21:35 |
| ← Axius left | 21:35 |
| → iron joined | 21:35 |
| ← __iron left | 21:36 |
| ← bugfux left | 21:36 |
| → jelmer joined | 21:40 |
| → gdrage joined | 21:41 |
| → jeanrussou joined | 21:41 |
| ← jeanrussou left | 21:41 |
| ← jelmer left | 21:41 |
| → Rolenun joined | 21:42 |
| → Axius joined | 21:42 |
| ← bambule left | 21:43 |
| → khmarbaise_ joined | 21:43 |
| ← Axius left | 21:43 |
| ← kristian42 left | 21:44 |
| → kristian42 joined | 21:45 |
| ← Mathnerd314 left | 21:45 |
| ← Davey left | 21:45 |
| → neun_ joined | 21:47 |
| → _Vi joined | 21:48 |
| → jelmer joined | 21:54 |
| ← nullvariable left | 21:57 |
| → nullvariable1 joined | 21:57 |
| nullvariable1 → nullvariable | 21:57 |
| ← Sky[x] left | 21:57 |
| → skyl joined | 21:57 |
| ← mbroeker left | 21:57 |
|
skyl
| I want to go back to what I had in commit 7f01e83... for a file, foo/bar.baz | 21:58 |
|
jtbandes
| I think you use checkout for that | 21:59 |
| ← khmarbaise left | 21:59 |
| khmarbaise_ → khmarbaise | 21:59 |
|
gitster
| check the file out of the commit (i.e. "git checkout 7f01e83 -- foo/bar.baz") | 22:00 |
| ← dreiss_ left | 22:01 |
| ← icwiener left | 22:02 |
| ← calin left | 22:03 |
| → calin joined | 22:04 |
| → CM__ joined | 22:04 |
|
CM__
| Hi -- i've a git repo which originally was done from a git cvsimport -- occasionally what i would like to do is clone this git repo, and then use git cvsimport to update this repository from CVS -- what's the best way of doing this? | 22:05 |
| ← khmarbaise left | 22:09 |
|
skyl
| thanks all, see you next time | 22:10 |
| ← skyl left | 22:10 |
| → japhb joined | 22:10 |
|
japhb
| I have a topic branch off of master, and that topic branch is getting ready to merge back; I've rebased it against the current HEAD of master and resolved all conflicts there. However, the topic branch is somewhat dirty (a few bad or mixed-quality commits, a few commits that don't belong in master yet), and I'd like to copy the good bits to a clean branch of master, ready for final test and merge back. What's the best way to go about this? | 22:15 |
|
| From reading the docs, it looks like 'git rebase -i' would do the right thing if I wanted to edit the topic branch directly -- but I want to do my cleanup in a new branch instead. | 22:15 |
| → kpreid_ joined | 22:18 |
| ← yhager left | 22:20 |
| → yhager_ joined | 22:20 |
| ← gambler left | 22:20 |
| ← ehabkost_ left | 22:20 |
|
gitster
| "git checkout -b new-branch topic && git rebase -i on-top-of-whatever"? | 22:22 |
| → gambler joined | 22:24 |
| ← MrC left | 22:24 |
| → tekky joined | 22:26 |
| ← kpreid_ left | 22:31 |
| → bcardarella joined | 22:32 |
| → stamina_ joined | 22:32 |
| → cannonball joined | 22:34 |
| → thiago_home joined | 22:37 |
| ← nitrate__ left | 22:37 |
| → d0k joined | 22:38 |
| → FunkeeMonk joined | 22:39 |
| ← d0k left | 22:42 |
| ← tg` left | 22:45 |
|
japhb
| gitster, ah, interesting idea. Thanks, will give that a try. | 22:45 |
| → tg` joined | 22:45 |
| → d0k joined | 22:48 |
| ← hipe left | 22:50 |
| ← jelmer left | 22:53 |
| ← tekky left | 22:53 |
|
| gitster actually wants to know why "checkout -b && do it" was not obvious and instead was "interesting" for "I want to do my cleanup in a new breanch instead". It is a sad indication that something is wrong in the documentation and tutorial... | 22:57 |
| ← cannonball left | 22:58 |
| ← thiago_home left | 23:03 |
|
japhb
| gitster, well, unless I understood you, sadly it's interesting in the sense that it doesn't actually work. | 23:03 |
| ← lucsky left | 23:03 |
|
japhb
| er, "misunderstood" | 23:04 |
|
| I can't seem to figure out an incantation of 'git rebase -i --onto master [<something here>]' that produces anything other than an error message. | 23:06 |
| ← bcardarella left | 23:06 |
| ← neun_ left | 23:07 |
| ← maxter left | 23:12 |
|
idletask
| Question: what are (non-object) tags wrt branches? Just symbolic refs that you cannot commit on? | 23:15 |
|
Ilari
| idletask: symbolic refs are something different (they are like symbolic links). | 23:16 |
|
| idletask: Tags in git are pretty much like branches one can't directly check out... | 23:17 |
|
idletask
| OK, forget about "symbolic" then | 23:17 |
|
Ilari
| japhb: What's the first commit on current you don't want to rebase? | 23:18 |
|
idletask
| Ilari: uh, really? | 23:18 |
|
Ilari
| idletask: Trying to check one out results detached HEAD. | 23:19 |
|
idletask
| Ilari: ah, OK - but then it doesn't prevent you from bisecting using one of these, or creating a branch from one of these, AFAICS - correct? | 23:20 |
|
Ilari
| idletask: Right. | 23:20 |
|
| idletask: In fact, for such purposes, any commit ID can be used. | 23:21 |
|
idletask
| Ilari: same for git archive, I gather? | 23:21 |
|
| And by "commit ID", I gather you mean the SHA1? | 23:21 |
| ← stamina_ left | 23:22 |
| ← rhett left | 23:23 |
|
Ilari
| idletask: commit ID is special case of object ID. And both are also called SHA1s. | 23:24 |
| → cannonball joined | 23:24 |
|
idletask
| Ilari: well yes, I didn't mean to generalize that far, but I am partially correct, amn't I? :p | 23:26 |
|
Ilari
| idletask: Both are used... | 23:27 |
| → tibra joined | 23:29 |
| ← fcuk112_ left | 23:29 |
| ← fcuk112__ left | 23:30 |
| → hobodave joined | 23:30 |
| → drizzd joined | 23:35 |
| → segher_ joined | 23:36 |
| ← tibra left | 23:36 |
| → stamina_ joined | 23:42 |
| ← segher left | 23:43 |
| → Jak_o_Shadows joined | 23:45 |
| ← intripoon left | 23:52 |
| ← tbuehlmann left | 23:57 |
| ← gdrage left | 23:57 |
| → jelmer joined | 23:57 |
| → aleray joined | 23:59 |