IRCloggy #git 2010-04-22

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2010-04-22

← enherit left00:00
enherit_ → enherit00:00
← ShooterMG left00:01
→ saccade joined00:02
← Arelius left00:04
→ Arelius joined00:04
← eighty4 left00:04
← fgiraldeau left00:05
→ codetroll joined00:06
tgunr I have one object in my server repo giving me greate grief, i need to delete it but using git filter-branch causes 'too much memory' error on my host, is there any other way to remove this object, the repo is new and only has 2 commits00:07
→ jrmuizel joined00:08
← schacon_ left00:08
← airborn left00:11
→ pheaver joined00:11
→ binjured joined00:11
→ developernotes joined00:12
→ dreiss joined00:13
→ cmoney joined00:13
← rolfb left00:15
← cmoney left00:17
→ stantont joined00:20
→ cmoney joined00:21
← Arelius left00:21
→ kenneth_reitz joined00:21
cmoney quick question, i'm using 1.6.4.2, i have a local branch i created, I pushed it to main repo via git push origin branch00:21
→ Arelius joined00:21
Ilari tgunr: Is it part of first or second commit?00:22
cmoney do i need to specifically tell my local branch to track that remote branch that was created?00:22
so i can git push and git pull remote changes in that branch00:22
Ilari tgunr: Also, did you try index or tree filtering?00:22
→ unreal joined00:23
Ilari cmoney: Yes, and since git version is old, that needs to be done by editing the config file.00:23
← friskd left00:23
Ilari cmoney: 'git pull' on that branch gives settings you needs.00:23
*need00:23
cmoney it tells me it doesn't appear to be a repo00:24
Ilari cmoney: What is the exact error message?00:25
cmoney 'origin/branch' does not appear to be a git repository00:25
→ webchick joined00:25
cmoney in my config i just set remote (= origin/branch) and merge (= refs/heads/branch)00:25
Ilari cmoney: origin/branch is very likely incorrect. Try 'origin'.00:26
→ ryan_scott joined00:26
← dreiss left00:26
cmoney ah00:26
i think that did it00:26
thanks!00:27
← webchick left00:30
eli Is there a convenient way to show a single file from a repository based on some revision?00:30
Something like `ls-tree', but for a file.00:30
→ mithro joined00:31
→ webchick joined00:32
tgunr llari, i took out the 2 files and my hosting server still errors out on memory usage so i guess it's a no go for this repo00:32
→ wjames5_ joined00:32
Ilari eli: 'git show revision:path/file'?00:32
← defectiv left00:32
← developernotes left00:32
wjames5_ hi00:32
eli Ilari: Thanks! (I saw it, but forgot the ":" syntax...)00:33
wjames5_ so trying to resolve a bunch of conflicts and in my current case I dont want to go through each file, id be happy to say screw my workspace version, lets just go with what came from the pull00:33
is there an easy way to tell git to throw away 'my' work and use what i pulled00:34
Caelum how do you revert a specific commit?00:34
wjames5_ on a file by file bases, or even for a whole dir of files00:34
thanks in advance00:34
→ rektide joined00:35
← christophsturm left00:35
→ christophsturm joined00:36
wjames5_ git reset --hard HEAD maybe?00:36
Caelum ahh, it's just git revert sha00:37
cool00:37
← Arelius left00:38
→ Arelius joined00:38
← christophsturm left00:40
wjames5_ nope reset sends me in a circle00:41
← mjf left00:42
← blaines left00:44
→ Raimondi joined00:45
sitaram divVerent: ping00:47
godlygeek i want to merge two branches without affecting any files in the working directory. i'm trying something like: export GIT_INDEX_FILE=`mktemp`; git read-tree -m -i branch1; git read-tree -m -i branch2; git ls-files -s ... and only the files from branch2 are in the index. what am i misunderstanding?00:48
← tgunr left00:50
← Guthur left00:50
→ jaysern joined00:52
← Alagar left00:53
wjames5_ → wjames500:54
← Arelius left00:55
→ Arelius joined00:55
pipegeek Is there some way to embed a commit template in a repository such that people cloning the repo will get the template?00:57
← ipatrol left00:58
→ stringo0 joined01:01
← hakunin left01:02
Semikolon A colored git add -i? Is that possible?01:03
more than just the diffs01:03
→ scarabx joined01:03
godlygeek what, other than the diffs, do you want to color?01:04
← tedoc2000 left01:05
← manyoso left01:05
ilteris- hey guys, I do have a remote repo that I have been working on another computer and I pushed and now sits on the remote server. Now I get a new computer and I just want to continue working on that project. Should I just first create a local git repo and then pull or just clone and go from there?01:06
← adiabatic left01:07
→ dreiss joined01:09
← slonopotamus left01:09
→ Vampire0_ joined01:09
Semikolon godlygeek ‣ not sure, hm, maybe less important text could be made grey or something... and the file list could be colored01:10
← webchick left01:12
← Arelius left01:12
→ Arelius joined01:13
→ pheaver_ joined01:18
← pheaver left01:20
pheaver_ → pheaver01:20
← jrmuizel left01:24
→ _VVSiz_ joined01:24
→ kur1j joined01:24
→ warlock_mza joined01:25
→ hyperair joined01:28
← Bass10 left01:29
← Arelius left01:30
→ Arelius joined01:31
← tildeequals left01:32
→ alester joined01:33
← navetz left01:33
→ coolcat_ joined01:35
→ EricInBNE joined01:35
← warlock_mza left01:35
coolcat_ → Guest6175701:35
← justin-george left01:40
→ rduplain joined01:42
→ KatrinaTheLamia joined01:46
KatrinaTheLamia oh, hey--having issues setting up my git repo... it claims that gitosis-admin.git does not appear to exist.01:47
well, gitosis server rather01:47
crab how does it make this claim?01:47
← Arelius left01:49
→ Arelius joined01:49
KatrinaTheLamia crab: via the standard error message: fatal: 'gitosis-admin.git' does not appear to be a git repository01:50
fatal: The remote end hung up unexpectedly01:50
← simNIX left01:51
← timofonic left01:51
KatrinaTheLamia looking up some stuff on google on a "fix"--though.. most of these do not seem to be any more affective than goggles01:51
→ timofonic joined01:52
← fcoury|away left01:52
kur1j where are you trying to run these command?01:52
crab you ran gitosis-init and got no errors? where does your gitosis-admin.git live?01:52
← meanburrito920 left01:54
crab and what were you doing that gave this error message? the initial clone of [email@hidden.address] or something else?01:54
KatrinaTheLamia crab: no errors on gitosis-init01:55
and yeah, the initial clone attempt of it01:55
→ consolers joined01:55
KatrinaTheLamia kur1j: from a computer that has a valid public rsa key01:56
→ meanburrito920 joined01:56
← dreiss left01:56
← enherit left01:57
kur1j what would be the best way to do this...gitolite is running under the user "git", I have redmine looking at the repo in /home/git/repository/blah.git...redmine is running under the www which is in the www group...when I push to a repository in /home/git/repository/blah.git the repo gets set to 755 and redmine can't read from the repository, should I just add the git user to the www group or is there a better way to do this?01:58
KatrinaTheLamia: so I assume you did this? sudo -H -u git gitosis-init < /tmp/id_rsa.pub01:58
→ mdr22 joined01:58
→ yarg joined01:59
→ t0rc joined01:59
← ericlee left01:59
→ felipe joined01:59
→ justin-george joined01:59
→ jamescarr joined01:59
KatrinaTheLamia kur1j: well, if I didn't I hardly was following directions then.01:59
jamescarr hey, how can I ignore all files beginning with dot?01:59
KatrinaTheLamia kur1j: so in short, yet.01:59
yes*01:59
kur1j so at what point did you get this error?02:00
yarg Hi, I realized that, in a project I was working on, which I was thinking of splitting into sub modules, it would be best if I could merge two of the repos into one. If I have two repos which are distinct, but one would be contained in the other, how can I have the02:00
KatrinaTheLamia uh... right after trying to initally grab the gitosis-admin.git repo?02:00
yarg embedded one become part of the top one, and save history? Is that possible?02:00
KatrinaTheLamia kur1j: also for further information, yes, gitosis is installed in ~git. And I did make certain the permission on hooks/post_update were correct02:02
kur1j jamescarr: .gitignore?02:02
and you have your private key on the machine you are trying to clone from?02:03
yarg I'll try clarifying a bit: Is it possible to merge two repos into one and combine their histories? That would be a nice starting point. Appreciate any tips I can receive.02:03
kur1j yarg: fetch from one repot02:04
repo*02:04
← t0rc left02:05
KatrinaTheLamia oh, right, just incase there are any issues wih my distro I am trying to setup gitosis on, it would be Arch Linux.02:05
→ byang joined02:05
← LRN left02:06
kur1j KatrinaTheLamia: it shouldn't be a problem just as long as python and setuptools is installed correctly02:06
← ehabkost left02:06
kur1j (and git of course)02:06
← Arelius left02:06
KatrinaTheLamia kur1j: they should be... but symptoms are pointing to something not being correctly installed/setup02:07
→ Arelius joined02:07
sitaram kur1j: simplest is to add secondary group membership of group git to user www02:07
KatrinaTheLamia Python is 2.6.5 (if that makes a difference)02:07
kur1j sitaram: well gits main repo is wheel02:08
sitaram kur1j: I fail to understand why 755 prevents read...02:08
by anyone!02:08
→ LRN joined02:08
KatrinaTheLamia and setuptools are versioned at 0.6c1102:09
→ Gulug joined02:09
← wjames5 left02:09
kur1j sitaram: well redmine is trying to write something in the repo02:09
sitaram why? and what?02:09
(and your first message did say "...can't read from the repository..." :-)02:10
kur1j sorry, it should have been write02:11
→ tildeequals joined02:11
kur1j actually im not real sure what redmine is trying to write to02:11
sitaram oh I got that now :) but I'm curious what redmine wants to write... does it want to push a commit or something?02:11
← parasti left02:12
sitaram until you figure that out, it's going to be hard. You can always umask the whole thing to get 775 and make www user part of git group and then setgid, and all that (just like "git init --shared") but it would be dangerous not knowing what redmine is trying to write02:12
kur1j I understand02:13
sitaram because that might subvert gitolite security if someone were to find a hole in redmine that could be used to get into gitolite02:13
godlygeek i want to merge two branches without affecting any files in the working directory. i'm trying something like: export GIT_INDEX_FILE=`mktemp`; git read-tree -m -i branch1; git read-tree -m -i branch2; git ls-files -s ... and only the files from branch2 are in the index. what am i misunderstanding? is there no easier way to do this than using git mktree?02:13
jamescarr do I need to commit / push the .gitignore?02:14
sitaram godlygeek: your nick is great; only godlygeek's should be using plumbing commands in 2010 :)02:15
godlygeek: but plumbing or not, you cannot merge without using the working directory. I suggest you stash, merge, resolve conflicts if any (this is why it *needs* a working directory, and I say this without even knowing what read-tree -m does), and unstash02:16
← Guest61757 left02:16
← meanburrito920 left02:16
kur1j jamescarr: yes02:16
jamescarr frak... it ignore my .gitignore :(02:17
do I put .gitignore inside the .git dir?02:17
kur1j http://stackoverflow.com/questions/767147/how-do-i-tell-git-to-ignore-gitignore02:17
?02:17
sitaram godlygeek: hmm... the read-tree manpage does not come right out and say it needs a working tree... interesting02:18
mugwump jamescarr: .git/info/exclude02:19
← juan_arandaalvar left02:19
sitaram godlygeek: and the "-i" option's description indicates it *can* work without touching the work tree. Oh well, that's I'm not a godly geek :)02:20
← aresnick left02:20
jamescarr which is it? .gitignore or .git/info/exclude?02:20
← sh1mmer left02:21
→ rgr joined02:21
→ cytrinox_ joined02:21
→ meanburrito920 joined02:21
godlygeek sitaram: it's guaranteed that there won't be any conflicts. :)02:21
mugwump jamescarr: both02:22
godlygeek in my case, i'm trying to just merge together two different git-svn branches into a single (fake) "upstream" branch - and i know that there are no duplicate files.02:22
mugwump jamescarr: .git/info/exclude is not a part of the project history, .gitignore is02:23
← stantont left02:23
→ gdey joined02:23
← Arelius left02:23
→ Arelius joined02:24
cytrinox_ → cytrinox02:24
→ sh1m joined02:25
→ stantont joined02:25
← sh1m left02:28
← kenneth_reitz left02:28
→ coppro joined02:28
→ Remixman joined02:31
Remixman j #math02:31
← novas0x2a1 left02:32
← consolers left02:33
→ johnw joined02:39
← byteframe left02:40
← Remixman left02:40
← Arelius left02:41
kur1j sitaram: ok so I figured it out I think...so when I do a push the "master" file in the refs directory gets set as 60002:42
→ Arelius joined02:42
→ mefesto joined02:45
→ blaines joined02:45
← iruediger left02:45
← rgr left02:46
→ rgr joined02:46
→ Remixman joined02:48
← coppro left02:50
→ novas0x2a joined02:51
← johnw left02:51
→ schacon_ joined02:52
→ timj_ joined02:52
→ johnw joined02:54
← mdr22 left02:54
kur1j so how do I go about making the push create the master file with different permissions on the file?02:57
← kukks left02:57
→ treak007 joined02:58
← Arelius left02:58
→ Arelius joined02:59
← Remixman left02:59
← Semikolon left03:00
← rgr left03:01
← schacon_ left03:01
← ajonat left03:02
← scarabx left03:03
→ xmms2|nano joined03:04
→ Remixman joined03:04
→ schacon_ joined03:06
← schacon_ left03:08
→ Fatal joined03:09
→ stantont_ joined03:10
→ quotemstr joined03:12
quotemstr How do I push an _old_ version of a repository to a remote location?03:12
← Remixman left03:13
→ mdel joined03:14
offby1 hmm03:15
quotemstr: obviously it'd be easier to push the current version, and maybe somehow use older commits. But something tells me you don't want that03:16
← Arelius left03:16
quotemstr No. I'd like to ensure that no changes made later than two weeks ago make it to the remote side.03:16
Granted, I _just_ started using git, so maybe I should RTFM first.03:16
sitaram kur1j: so it's not actually writing anything?03:17
it == redmine03:17
kur1j sitaram: no I was incorrect03:17
the refs/master file is just being made 600 every time I push03:17
sitaram kur1j: if that's all it is, then you need to set the umask in ~/.gitolite.rc -- it's well commented03:17
→ Arelius joined03:17
→ superjoe joined03:17
→ hakunin joined03:17
kur1j sitaram: ok great thanks03:17
superjoe is there a way to get a nice list of changes between 2 tags?03:17
sitaram kur1j: look for UMASK (in caps) in that file and follow the comments to change the value as you like03:18
→ slonopotamus joined03:19
← meanburrito920 left03:19
superjoe kinda like the output of shortlog but only between 2 tags03:20
→ Remixman joined03:20
sitaram superjoe: what's wrong with git shortlog tag1..tag203:20
← blaines left03:20
quotemstr Basically, I want to push a snapshot of the repository as it was two weeks ago.03:21
Any ideas?03:21
superjoe sitaram, that'll do it. I didn't know you needed 2 periods03:21
kur1j sitaram: perfect thats it03:22
← stantont left03:22
→ Belna_ joined03:23
sitaram superjoe: A..B is standard syntax for "all commits in B but not in A"03:23
→ jacobat_ joined03:23
superjoe I see03:24
← Twisted_Mentat left03:25
→ bsnyder joined03:25
sitaram kur1j: if you do have any 'read' restrictions at all, I still suggest you make 'www' have a secondary group of 'git' and use 0027 as the umask03:26
instead of 002203:26
kur1j already did that :D03:29
thanks03:29
← mdel left03:29
→ mdel joined03:30
← Remixman left03:32
← Arelius left03:34
→ Arelius joined03:35
→ fgiraldeau joined03:36
← dabd left03:36
Belna_ → Belna|home03:37
→ Remixman joined03:38
← jaysern left03:38
← gaveen left03:40
→ dreiss joined03:42
→ blaines joined03:44
← blaines left03:44
← bx2 left03:44
← icefox left03:46
← camonz left03:50
← Arelius left03:50
→ camonz joined03:50
← Remixman left03:50
→ Arelius joined03:51
→ coppro joined03:52
← urkud left03:54
← camonz left03:55
→ Remixman joined03:58
→ reprore_ joined03:58
← slonopotamus left04:01
← rduplain left04:01
← Remixman left04:02
→ joeconyers joined04:05
→ alireza_ joined04:06
→ altogether joined04:07
← fgiraldeau left04:07
← Arelius left04:07
← jmcantrell left04:08
→ Arelius joined04:09
→ Remixman joined04:09
→ eighty4 joined04:10
→ meanburrito920 joined04:11
← jfkw left04:12
← Remixman left04:14
→ Remixman joined04:19
← mythos left04:21
→ icefox joined04:22
← mdel left04:22
← ryan_scott left04:22
→ mdel joined04:22
→ AAA_awright_ joined04:23
← altogether left04:26
← Arelius left04:26
→ Arelius joined04:27
← Remixman left04:27
→ webchick joined04:28
← mefesto left04:28
→ Twisted_Mentat joined04:29
← tty1 left04:31
→ Remixman joined04:33
← gnufied left04:33
→ mythos joined04:34
→ gnufied joined04:37
← Remixman left04:38
← eletuchy left04:38
← tanoku left04:38
← bsnyder left04:41
← Arelius left04:43
→ Arelius joined04:44
→ navetz joined04:45
→ Remixman joined04:45
→ jjuran joined04:46
← gnufied left04:46
← johnw left04:46
→ jony joined04:47
→ gnufied joined04:48
→ bsnyder joined04:48
→ resmo joined04:49
→ tiger2wander joined04:51
← Meow`` left04:51
tiger2wander halo all04:51
→ eighty4_ joined04:51
tiger2wander How I can allow user to push new repository in gitolite configuration file? please help me!04:52
← Remixman left04:52
← MattDeKrey left04:53
← eighty4 left04:53
→ kblin joined04:54
kblin hi folks04:54
← madewokherd left04:55
offby1 nobody here but us zombie processes.04:55
→ schacon_ joined04:55
offby1 tiger2wander: I don't think that's possible. I think you need to create the new repo first.04:55
kblin I can deal with that04:56
→ friskd joined04:56
kblin gets a cricket bat04:56
offby1 flees04:56
sitaram offby1: hmm no; the recommended way is to add it to the config, add/commit/push that change, and an empty repo is created on the server04:56
offby1 hm04:56
sitaram tiger2wander: how did you install?04:57
tiger2wander: how did you install gitolite?04:57
→ khelll joined04:57
→ Remixman joined04:57
offby1 suspects the tiger has wandered off04:59
← Twisted_Mentat left04:59
→ psankar joined04:59
sitaram LOL!04:59
← Yuffster left05:00
tiger2wander sitaram, I have install gitolite by easyinstall using pu branch05:00
sitaram tiger2wander: at the end of the install did you get a message that looked like this: http://pastebin.com/Qw6Cxez705:00
← khelll left05:01
← Arelius left05:01
← schacon_ left05:01
→ Yuffster joined05:01
← Remixman left05:01
→ Arelius joined05:02
← Belna|home left05:02
tiger2wander sitaram, I don't remember exactly, because of I have installed it a long time ago05:03
← friskd left05:04
tiger2wander sitaram, Is there anyway to do that?05:04
← gnufied left05:04
sitaram tiger2wander: yeah you can run it again (with exactly the same arguments) to see the same message if you like, but for now, just take a look at line 11 of that paste and do what it says05:05
tiger2wander sitaram, ok, reading...05:07
→ peritus- joined05:08
→ Remixman joined05:09
tiger2wander sitaram, yes, I known about that. There is only one way to create a repository is write it into gitolite's configuration file05:09
← joeconyers left05:10
tiger2wander sitaram, but it will be hard or become complex for normal user that need to manage a group of repositories, they are not system admin then do that things may hard to them :(05:10
tiger2wander is away: Away05:10
Textmode night all05:11
← Textmode left05:11
→ consolers joined05:12
← jakubzalas left05:12
→ Adaptee joined05:13
→ adaro_ joined05:13
→ aspotashev|eeepc joined05:14
← dreiss left05:14
sitaram tiger2wander: if editing a simple file, git add, git commit, and git push is hard then he should not be doing this job, sorry...05:15
tiger2wander: perhaps you want one of the web-based tools for this like github or gitorious or girocco05:15
← Theravadan left05:17
← Yuffster left05:17
→ Theravadan joined05:18
← Arelius left05:19
→ mdel_ joined05:19
→ Arelius joined05:19
→ tty1 joined05:19
← jamescarr left05:19
← consolers left05:19
← tg left05:19
→ johnw joined05:20
→ tg joined05:20
← mdel left05:20
→ robinr joined05:23
← Remixman left05:24
→ priidu joined05:25
AAA_awright_ → AAA_awright05:26
← jony left05:27
→ dj_tjerk joined05:29
→ posciak joined05:30
→ Remixman joined05:31
→ roop joined05:32
← wolog left05:33
→ sh1mmer joined05:33
← Arelius left05:33
→ Arelius joined05:34
→ opalka joined05:34
→ jony joined05:34
→ shennyg joined05:37
→ vu3rdd joined05:39
← timofonic left05:39
→ timofonic joined05:39
→ gnufied joined05:40
← justin-george left05:42
→ iaefai joined05:48
iaefai Any ideas why git thinks I have renamed a file that I have not?05:48
coppro If you created a file that is very similar to a deleted one, it will think that05:49
→ xiong joined05:49
← Arelius left05:49
→ Arelius joined05:50
xiong I may have done something dumb. I started a project and it stalled. Now I want to continue it but under a different name. I created the new project and set up my folder structure. Now I want to pick up where I left off. The folder structures don't match.05:51
← peritus- left05:51
tiger2wander sitaram, yes, I'm reviewing them, perhaps it fit my requirement or at least work fine with gitolite in some case :)05:51
coppro iaefai: There's probably some command to suppress this, but I don't know it05:51
xiong Um, I'm quite willing to throw out the new git repo entirely. But I'm not sure how to import the old one into the new project. Should I just duplicate the entire old project?05:51
iaefai I just did something manually to fix it05:52
→ eighty4 joined05:53
→ eletuchy joined05:53
← eighty4_ left05:54
← kblin left05:56
← adaro_ left05:56
← jsilver left05:56
Belna → Belna|work05:57
wereHamster xiong: what exactly do you want to change on the old project? Just the name?05:57
→ tbf joined05:57
xiong wereHamster, I forgot a key point of version control and tried to do two things at once. I changed the name and the overall folder organization.05:58
→ cozmo joined05:59
wereHamster changing the name is as easy as renaming the folder05:59
xiong wereHamster, Right, except I want the old project to remain in place; I'm actually using it to build the new version of itself.05:59
wereHamster and to change the folder structure, well, just move the folders around how you like it (with git mv)05:59
→ Heimidal joined05:59
← Heimidal left05:59
→ Heimidal joined05:59
wereHamster clone the old project to a new directory05:59
xiong ... and redo the folder structure changes. What I thought. Would have liked to keep the folder structure I've already fixed.06:00
wereHamster why redo?06:00
xiong Thanks for using the word 'clone', that tells me how to do it with git.06:01
Um, I did the folder structure changes in the new project, which was empty.06:01
-- I copied the old folder structure template, which I now see can be simplified.06:01
Ha ha, if this at times seems weird, it's because the purpose of the project is to do stuff like initialize new projects. :)06:02
← Remixman left06:03
→ Remixman joined06:03
← hakunin left06:04
← Arelius left06:05
→ Arelius joined06:06
xiong I think I will temporarily rename the new project, which contains nothing of real value; git clone old new; fix the new-now folder structure to match new-previous; and trash the temp. Thank you wereHamster++ I'm on my way.06:06
-- and the first order of business will be to fix the project script so that it calls git-clone!06:06
→ tvw joined06:07
→ skoop joined06:07
→ osier joined06:08
← treak007 left06:08
← mdel_ left06:08
← akamaus left06:10
← eighty4 left06:11
← robinr left06:11
→ cbreak_work joined06:12
→ robinr joined06:12
← warthog9 left06:13
← yarg left06:15
← gnufied left06:16
→ gnufied joined06:16
← icefox left06:17
xiong Please don't laugh, but: If I git clone --no-hardlinks foo bar, are *any* links created? Is bar completely independent of foo after the action?06:18
→ dmg joined06:22
← iaefai left06:22
← ph^ left06:22
→ steffkes joined06:22
← Arelius left06:23
→ fmardini joined06:23
→ Arelius joined06:24
→ hakunin joined06:24
robinr xiong: yes06:24
xiong Great, thank you robinr++06:26
← alester left06:26
xiong I'm going to beat sense into this miserable machine some day. git gives me the whip hand; thanks to you *all*.06:26
→ carl- joined06:28
→ thiago_home joined06:28
→ airborn joined06:29
→ bentob0x joined06:30
→ nor3 joined06:30
→ cilly joined06:30
← robinr left06:30
→ ProperN[out] joined06:31
← Remixman left06:31
← xiong left06:34
← ProperNoun left06:35
← dj_tjerk left06:35
→ TBBle joined06:36
TBBle Is there a way to extract a specific object from a pack file without the whole "move pack files out of the way, use git unpack-objects and then file the loose object you want"? I'm trying to fix another coder's repo, one of his loose commit objects got corrupted and I was going to give him my copy of it, but mine's in a pack.06:37
← Pupeno left06:37
→ warthog9 joined06:38
← aspotashev|eeepc left06:38
→ lanwin joined06:39
→ sanmarcos joined06:39
lanwin hi06:39
sanmarcos is there a way to store a log message? I find myself opening a text file to store the log message I will write when I commit06:39
lanwin i need help recover an git svn dcommit problemem06:39
← dmg left06:39
← vasandgvd left06:39
lanwin when ive try to dcommit it says: Merge conflict during commit: Your file or directory 'Components' is probably out-of-date:06:40
but git svn rebase says: Current branch svn is up to date.06:40
currently using the latest msysgit06:40
→ FFighter joined06:41
FFighter hello06:41
what is the easiest way to reapply an existent tag to another commit (i.e move it)06:41
Raimondi sanmarcos: Is this what you're looking for: git commit -m 'Log message'06:41
thiago_home first of all, you shouldn't move tags06:41
FFighter remove, apply, push force?06:41
thiago_home yes, that's the way06:42
FFighter thiago_home I know about this one ;)06:42
thanks06:42
sanmarcos Raimondi: you mean be more atomic?06:42
thiago_home note that people who have the tag will not see the moving06:42
← Arelius left06:42
→ Arelius joined06:42
← nor3 left06:43
sitaram thiago_home: even if they do "git remote update --prune"?06:43
sitaram is just curious; doesn't like moving tags either06:43
→ giallu joined06:43
TBBle Is there a way to query which pack file contains an object?06:43
→ lol_h joined06:43
thiago_home sitaram: yes06:44
tag fetchin doesn't overwrite the tag06:44
they need to delete it locally first06:44
← bentob0x left06:44
← Raimondi left06:45
← Heimidal left06:47
sitaram thiago_home: thanks! (/me learned something today...!)06:48
← TBBle left06:50
← gnufied left06:50
→ gnufied joined06:50
← tty1 left06:52
→ akamaus joined06:54
→ wolog joined06:55
← codetroll left06:57
→ codetroll joined06:58
→ ntoll joined06:58
← Arelius left07:00
→ Arelius joined07:00
← tiger2wander left07:02
sanmarcos anyone use git with xcode, how do you deal with branches?07:02
can you "Check out" branches in different directories?07:02
files/directories dissapearing at any moment does not sound good for Xcode07:03
← johnw left07:03
sanmarcos with branch switches that is07:03
→ johnw joined07:03
← shennyg left07:03
→ rafalkoszyk joined07:04
rafalkoszyk Whats the best way to merge code using git?07:04
→ tty1 joined07:05
→ steinberg joined07:06
→ raichoo joined07:06
thiago_home git merge otherbranch07:07
that's the best way07:07
← drizzd_ left07:07
← jony left07:08
← _VVSiz_ left07:08
← cozmo left07:08
← binjured left07:08
← onigiri_ left07:08
← maddog_ left07:08
← ghe left07:08
← KatrinaTheLamia left07:09
→ dmg joined07:11
← bsnyder left07:12
← killerchicken_ left07:12
→ ph^ joined07:13
→ killerchicken_ joined07:13
→ cozmo joined07:13
→ jony joined07:13
→ KatrinaTheLamia joined07:13
→ _VVSiz_ joined07:13
→ binjured joined07:13
→ onigiri_ joined07:13
→ maddog_ joined07:13
→ ghe joined07:13
→ deavid joined07:13
→ merlin83 joined07:13
→ ankit9 joined07:13
→ Boriskr joined07:13
→ spb joined07:13
→ SRabbelier joined07:13
→ mord joined07:13
→ Pistahh joined07:13
→ cworth joined07:13
→ caseyw joined07:13
→ Aikawa joined07:13
→ numbah joined07:13
→ FoxFurry1 joined07:13
→ JackWinter joined07:13
→ ijuma joined07:13
→ fda314925 joined07:13
→ huslu_ joined07:13
→ harleypig joined07:13
→ Husio joined07:13
→ BP{k} joined07:13
→ awx joined07:13
→ squentin joined07:13
→ ekneuss joined07:13
→ jailbox joined07:13
→ marowit joined07:13
→ avar joined07:13
→ robinsmidsrod joined07:13
→ Elfix joined07:13
→ Weiss joined07:13
→ bs joined07:13
→ maxb joined07:13
→ andres joined07:13
→ eco joined07:13
→ MadCoder joined07:13
→ eplots joined07:13
→ jaswope joined07:13
→ imarcusthis joined07:13
→ pmcnabb joined07:13
← zuez left07:13
→ zuez_ joined07:13
→ neutrino joined07:14
neutrino → tar-07:14
→ Heimidal joined07:15
← Heimidal left07:15
→ Heimidal joined07:15
← Arelius left07:18
→ werdan7 joined07:18
→ Arelius joined07:19
→ tPl0ch joined07:19
← thiago_home left07:20
→ khelll joined07:23
→ chrowe joined07:23
→ Zephyrus joined07:27
← tPl0ch left07:27
→ lucsky joined07:28
→ trivol joined07:28
→ ixti joined07:31
← onigiri_ left07:31
← ixti left07:31
divVerent sitaram: I am back again07:33
→ yarg joined07:34
← trivol left07:34
divVerent things I still want to change about the doc is mainly: i want to get rid of manually editing passwd/shadow, and instead find the correct useradd command :P07:34
johnw divVerent: The Return07:34
divVerent well, I am from Germany, and sitaram apparently is not :P07:34
(time zones)07:34
→ chittoor joined07:35
→ sveinse joined07:35
→ voxpelli joined07:35
← jovianjake left07:36
← Arelius left07:36
sveinse Hi. I'm working on many checked out copies of the same tree. However, having 4 copies of the same tree with the same .git/ directory is inefficient. Can I ln -s ../project/.git .git to save space?07:36
→ saLOUt joined07:36
→ Arelius joined07:37
sanmarcos depends on how git stores file references absolute or relative07:37
hat could cause trouble07:37
saLOUt why isn't local git repo not working when accessing via sshfs?07:37
doener sveinse: if you do a clone using a path, the object database is just hardlinked, so no space wasted07:37
sveinse: and part of the .git directory is at least HEAD, which stores what you have checked out, so the symlink wouldn't work07:37
sveinse: if you're working on a different branch in each clone, you could use git-new-workdir, which is to be found in contrib/workdir07:38
sveinse doener: Ah, so I clone from the directory where I cloned from externally?07:38
doener: No, I'm not. Up until now I have done cp -a dir1 dir2 which copies the checked out files and the entire repo07:39
← ereslibre left07:39
doener sveinse: you could also use "clone --shared" or "clone --reference" (see the man page).07:39
sveinse doener: thanks, I'll check it out07:40
doener sveinse: and finally, may I ask why you don't simply create branches and switch between them?07:40
saLOUt when using sshfs: git status fails with the error fatal: unable to write new_index file07:41
sveinse doener: sure. I need the build tree. Its the linux kernel we're talking about, and I have one tree compiles with debug and one without. I need access to the .o files while debugging07:41
doener out of tree builds should work quite ok for that.07:42
sveinse doener: Hence I have two identical copies of the trees. (I have experimented with source-outside-build-dir, but some of the toolchain/debug doesnt cope with that07:42
← FFighter left07:42
doener e.g. "make O=../non-debug" and "make O=../debug" or so07:43
sveinse doener: It's for cross compilation kernel, so the tools are a bit different from ordinary native tools.07:43
doener: But thanks for suggesting07:43
→ FFighter joined07:44
← ph^ left07:45
← tvw left07:46
← warthog9 left07:47
sveinse BTW: Is there a way to remove all files known to .git leaving all the non-commited files behind? I.e. a kind of anti-checkout07:47
johnw you could parse the output from git ls-files07:48
and pipe them to xargs rm07:48
then you need to do something with a depth-first find to remove empty directories07:48
← johnw left07:49
→ mastro joined07:51
← Arelius left07:52
→ Arelius joined07:53
→ Paraselene_ joined07:54
← FFighter left07:56
→ hebz0rl joined07:57
← krawek left07:57
→ d0ugal joined07:58
→ warthog9 joined07:58
→ sde_antrix1 joined07:59
→ galderz joined08:00
→ radarek joined08:02
→ zoniq joined08:03
→ barbi joined08:05
barbi hi08:05
→ jefferai joined08:05
barbi git newbie here. Need help with installing an application08:05
git clone git://git.gnome.org/pygtk08:05
on mac os 10.508:06
wereHamster cd pygtk; ./autogen.sh; ./configure; make08:06
→ Remixman joined08:06
barbi that was quick, thanks weerHmaster! :)08:08
wereHamster that, though, has nothing to do with git...08:08
← Arelius left08:09
→ shruggar joined08:09
→ masterkorp joined08:09
→ Arelius joined08:10
barbi ya, nothing to do with git, <#$%?4> thanks anyway08:11
← khelll left08:12
← jjuran left08:12
→ afrasi joined08:13
← ShaunR left08:15
→ ph^ joined08:15
← Theravadan left08:16
← sanmarcos left08:16
lol_h → bentob0x08:16
← Remixman left08:20
→ Remixman joined08:21
→ simplechat joined08:25
← psankar left08:25
← airborn left08:27
← Arelius left08:28
→ Arelius joined08:29
→ jmut joined08:33
→ psankar joined08:33
jmut where can I see nice GUIs for git windows mainly. I am only one with linux box at office..kinda want them to move to git but neeed to show alternative and why it's better than svn. For me personally it's because of easy branching/manipulating and speed. I guess most people here will cry out because they don't have gui and stuff08:34
← dmg left08:34
tango_ there is a tortoisegit but I never personally used it. also, gitk and git-gui should work if you have tcl/tk08:41
← sveinse left08:44
← alireza_ left08:44
→ zequix joined08:44
→ torben joined08:46
← Arelius left08:47
→ Arelius joined08:47
→ christophsturm joined08:47
← barbi left08:48
→ Remixman_ joined08:48
← Remixman left08:48
AAA_awright jmut: Yeah TortoiseGit is a pretty good UI08:48
→ GarethAdams|Work joined08:49
→ tvw joined08:49
→ jonalv joined08:49
→ dj_tjerk joined08:51
→ j416 joined08:52
→ gergap joined08:52
→ dmg joined08:54
← zequix left08:54
← Remixman_ left08:54
→ zequix joined08:54
sitaram divVerent: I had tried to send you an email using the email address in your patch... bounced; wait let me paste08:56
→ Bennid joined08:56
→ aziz joined08:58
← stringo0 left08:58
→ urkud joined09:00
→ Remixman joined09:03
← zequix left09:04
← hyperair left09:06
← Arelius left09:06
← locklace left09:07
→ Arelius joined09:07
→ locklace joined09:08
→ bluenovember joined09:09
← eletuchy left09:09
→ curtana joined09:10
← project2501a left09:10
← dmg left09:10
→ jjuran joined09:11
→ glasspen joined09:20
glasspen → Guest5077209:20
← Guest50772 left09:21
→ glasspen_ joined09:21
← darwin_ left09:22
← bentob0x left09:23
→ bentob0x joined09:23
→ hyperair joined09:23
← Heimidal left09:24
→ Heimidal joined09:24
← Heimidal left09:24
→ Heimidal joined09:24
← Arelius left09:25
→ d0k joined09:25
→ Arelius joined09:26
← ilteris- left09:27
← mithro left09:27
→ Yuuhi joined09:29
→ Tommy[D] joined09:31
← tmske left09:31
Garen_ → Garen09:31
→ froschi joined09:31
xmms2|nano → nano-09:34
← nano- left09:34
→ nano- joined09:34
← zoniq left09:37
→ zoniq joined09:38
→ quotemstr_ joined09:39
→ quotemstr__ joined09:40
← quotemstr_ left09:40
lanwin is there a simple way of applying a list of patches in git where each patch is a single commit?`09:42
frakturfreak_ → frakturfreak09:42
thiago so you have a set of patch files?09:42
posciak lanwin: do you have any control on how they are generated?09:42
lanwin yes09:43
← quotemstr left09:43
quotemstr__ → quotemstr09:43
j416 lanwin: man git-am09:43
Gitbot lanwin: the git-am manpage can be found at http://git.or.cz/man/git-am09:43
posciak lanwin: use format-patch and git-am09:43
j416 ↑09:43
lanwin isnt git-am only for mbox or maildir files?09:43
j416 lanwin: an mbox file is a text file, with concatenated e-mails09:43
thiago cat *.patch | git am -09:43
j416 git format-patch generates patch files in this format, you can just cat them together09:44
lanwin ok09:44
i will try09:44
← Arelius left09:44
→ Arelius joined09:46
sgronblo How do I get git status to show files which are not added if they are in a subdir which is not added?09:46
Rhonda git only lists the subdir on itself, it doesn't traverse into unknown territory.09:48
sgronblo but can I get it to do that?09:49
j416 sgronblo: git status -u09:49
→ mithro joined09:49
j416 sgronblo: if it's for a script, you might want to consider 'git status --untracked-files=all' for clarity09:50
sgronblo: also: man git-status09:51
Gitbot sgronblo: the git-status manpage can be found at http://git.or.cz/man/git-status09:51
sgronblo j416: yeah i just had a look at it09:51
thanks09:51
does exactly what i wanted09:51
j416 :)09:52
→ simNIX joined09:53
→ khaase joined09:55
← raichoo left09:56
→ Weasel[DK] joined09:58
→ raichoo joined09:58
glasspen_ :09:58
← j416 left10:00
← Arelius left10:02
→ Arelius joined10:02
→ tatsuya joined10:03
← mithro left10:04
← hyperair left10:04
← torben left10:04
← masterkorp left10:04
← radarek left10:04
← tg left10:04
← jomofo left10:04
← s4msung left10:04
← kenyon left10:04
→ iizukaway joined10:05
→ eean joined10:05
→ kalmah joined10:05
kalmah DCC SEND "XXXXXXXXXXXXXXXXXXXXXXXXXX" 0 0 010:05
← zoniq left10:05
← iizukaway left10:05
← gnufied left10:05
→ gnufied joined10:06
→ mithro joined10:06
→ hyperair joined10:06
→ torben joined10:06
→ masterkorp joined10:06
→ radarek joined10:06
→ tg joined10:06
→ jomofo joined10:06
→ s4msung joined10:06
→ kenyon joined10:06
→ joevano joined10:06
→ d1b joined10:06
→ ThiefMaster joined10:06
→ jkp joined10:06
→ uau joined10:06
→ tro joined10:06
→ candybar joined10:06
→ shikamaru joined10:06
→ AlexanderS joined10:06
→ clb__ joined10:06
→ suzak_ joined10:06
→ knittl joined10:06
→ tmz joined10:06
→ sgronblo joined10:06
→ dna joined10:06
→ et joined10:06
→ Woody2143 joined10:06
→ RandalSchwartz joined10:06
→ rotty joined10:06
→ Stravy joined10:06
→ s0enke joined10:06
→ levifig joined10:06
→ fredriv joined10:06
→ kupsch joined10:06
→ BeerSerc joined10:06
← zuez_ left10:06
→ zuez__ joined10:06
→ iizukaway joined10:06
← tar- left10:06
→ neutrino joined10:06
← joevano left10:06
← shikamaru left10:06
← RandalSchwartz left10:06
← rotty left10:06
← d1b left10:06
← masterkorp left10:06
← neutrino left10:06
→ neutrino joined10:06
neutrino → tar-10:06
→ d1b joined10:06
→ naeu joined10:06
← tmz left10:06
← iizukaway left10:06
→ tmz joined10:07
→ rotty joined10:07
→ shikamaru joined10:07
← shikamaru left10:07
→ shikamaru joined10:07
→ joevano joined10:07
→ iizukaway joined10:07
→ masterkorp joined10:07
← curtana left10:07
→ gebi joined10:08
← kalmah left10:08
← ThiefMaster left10:08
→ curtana joined10:09
→ zoniq joined10:09
← roger_padactor left10:09
lanwin hmm when i try git-am i get a bunch of10:10
cat: .dotest/next: No such file or directory10:10
cat: .dotest/binary: No such file or directory10:10
warnings10:10
→ roger_padactor joined10:10
→ ThiefMaster joined10:10
→ aspotashev|eeepc joined10:10
← cilly left10:12
Dieterbe lanwin: what i would do is prepend the command with strace10:13
ie: strace git-am ..10:13
that might give you a clue on why it does that10:13
→ cilly joined10:14
← superjoe left10:14
→ flazz joined10:15
← Arelius left10:16
→ Arelius joined10:17
lanwin Dieterbe: u it outputs a lot things10:18
Dieterbe yep.10:19
$PAGER is your friend :)10:19
→ stamina joined10:20
← gergap left10:26
← gdey left10:28
← Arelius left10:32
→ Arelius joined10:32
← riz2 left10:32
→ LeLutin_ joined10:34
← gnufied left10:34
→ gnufied joined10:34
← kenyon left10:34
→ parasti joined10:35
← webchick left10:35
← akamaus left10:35
← glasspen_ left10:37
→ lcw joined10:37
lcw hello there - does anyone know how remove a subproject?10:37
← LeLutin left10:37
← urkud left10:43
sgronblo I'm occasionally getting some pretty weird merge conflicts for lines that I haven't done anything to (at least not knowingly) when trying to merge with changes pulled from svn10:44
→ Schmidt joined10:47
→ bobself joined10:47
← Arelius left10:48
→ Arelius joined10:48
→ petercoulton joined10:52
bluenovember sgronblo, perhaps something to do with line endings? Do you have a mix of linux/windows developers?10:54
← lcw left10:56
→ ehabkost joined10:57
sgronblo i guess it could be something related to that10:57
→ JohnFlux joined10:57
JohnFlux Hey all10:57
What was the command to go back to what head was before10:57
sgronblo So is anyone here using svn through git?10:57
And if so, how do you make sure you get nice commits and messages pushed to the svn repo10:58
I just committed some stuff that ended up with just the "Merged branch A into branch B"10:58
JohnFlux sgronblo: I didn't think that was possible when using git svn10:59
sgronblo: you should be always doing a rebase10:59
→ TheNewAndy joined11:00
sgronblo yeah i am doing git svn rebase11:01
← zoniq left11:01
→ zoniq joined11:01
→ linduxed joined11:02
linduxed i just did a "git svn rebase" and i got the following error11:02
Password for 'linduxed': Can't locate Term/ReadKey.pm in @INC (@INC contains: /usr/share/perl5/site_perl/5.10.1 /usr/lib/perl5/site_perl/5.10.1 /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl /usr/lib/perl5/current /usr/lib/perl5/site_perl/current .) at /usr/lib/git-core/git-svn line 3972.11:02
is this a lack of a package?11:02
or something like that?11:02
curtana yes11:03
→ leo2007 joined11:03
← aspotashev|eeepc left11:04
← tg left11:04
→ tg joined11:04
← yarg left11:05
linduxed lack of perl?11:07
shruggar it wouldn't have gotten that far if you didn't have perl11:07
← zoniq left11:07
shruggar read the message: you're missing Term/ReadKey.pm11:08
→ zoniq joined11:08
shruggar so you need to install Term::ReadKey11:08
← galderz left11:11
→ webchick joined11:13
→ jpetersson2 joined11:13
jpetersson2 hi all, I've recently gotten ahold of some git-patches I would need to merge with the linux-kernel git repository, right now I have all of these patches in a file, is there any easy function available in git or am I stuck using patch?11:14
→ NickMyers joined11:15
← zoniq left11:15
→ zoniq joined11:15
shruggar jpetersson2, "git am" or "git apply", depending on the format11:16
jpetersson2 awesome thanks!11:16
shruggar if it is to do with the linux-kernel, they were probably created with format-patch, in which case "git am" is what you want11:16
→ jonalv` joined11:16
jpetersson2 shruggar, doesn't git-am require you to pull the patches from a mailbox?11:17
← christophsturm left11:17
→ christophsturm joined11:17
← ntoll left11:17
shruggar jpetersson2, git-am reads a format which is identical to that of a mailbox, which is what git-format-patch outputs. If someone sent you output from git-format-patch, git-am can read it11:17
← jonalv left11:18
linduxed shruggar: how would i install Term::Readkey?11:18
jpetersson2 ok that should do the trick then, thanks again11:18
shruggar if someone sent you a bunch of diffs, even though they were using git at the time, you should go back and slap that person :)11:18
jpetersson2 shruggar, well I found them in an email-list :)11:18
← curtana left11:18
shruggar linduxed, depends on your distribution, but something like cpan -i Term::ReadKey might do it (I don't actually know the syntax for cpan, I'm just making a wild guess)11:19
linduxed, for example, I'd type: apt-get install libterm-readkey-perl11:20
NickMyers Hiya guys n gals, I'm trying to get gitosis working on my ubuntu server (9.10) but having real problems when I try and run the clone command 'git clone git@SERVER:gitosis-admin.git'. I think the problem is related to ssh authentication, but I know nothing more than what I've followed in the howto. Basically when I run the cmd I get 'Agent admitted failure to sign using the key' and asked for a password (which shouldn't be necessary as it should11:20
← zoniq left11:20
→ zoniq joined11:20
← NickMyers left11:22
← christophsturm left11:22
← zoniq left11:22
→ NickMyers joined11:22
→ zoniq joined11:23
→ domcat joined11:24
bobself I'm trying to get git submodules to work.11:24
I have 2 git repositories in ~/tmp:11:24
app111:24
app211:24
lib11:24
In app1 I tried this:11:24
git submodule add ../lib lib11:24
But I get this error message:11:24
remote (origin) does not have a url defined in .git/config11:25
My goal is to commit the state of the library when I commit app1. The libray11:25
is used by other apps, so I don't want the lib directory under the app1 directory.11:25
How do you do this?11:25
I mean 3 .git repositories are in ~/tmp11:26
← masterkorp left11:26
← lanwin left11:27
→ galderz joined11:27
← zoniq left11:28
← NickMyers left11:28
← Arelius left11:28
→ Arelius joined11:29
→ zoniq joined11:29
→ curtana joined11:33
→ engla joined11:36
← zoniq left11:38
→ khelll joined11:38
→ zoniq joined11:38
→ akamaus joined11:39
→ jamescarr joined11:40
→ bx2 joined11:41
→ enyovelcora joined11:42
enyovelcora Hi!11:42
I have a fork of a project, and want to get it up to date with the forked repo11:42
→ urkud joined11:43
enyovelcora pulling it gets me lots of merge conflicts11:43
← stantont_ left11:43
← zoniq left11:43
→ Silex joined11:43
Silex say I erased a file that was under versioning, how do I restore it? "git pull" doens't seem to work11:43
enyovelcora What's the best way to just say: get my fork up to date - don't try to resolve anything11:43
→ zoniq joined11:43
enyovelcora Silex: I think checkout should work11:45
Silex ok so I recheckout my current branch? will try11:45
← webchick left11:45
enyovelcora No11:46
Just the file11:46
Silex: http://thefinerstuff.posterous.com/git-saved-my-day-restore-accid11:46
← merlin83 left11:46
Silex thanks11:46
enyovelcora yw11:46
→ coyo|pingout joined11:47
→ Guthur joined11:47
→ DavidKlein joined11:47
← jamescarr left11:47
← Bennid left11:49
← urkud left11:50
← zoniq left11:50
→ zoniq joined11:51
→ rgr_ joined11:51
→ cannonball joined11:52
← timofonic left11:53
steffkes is there any config-option that "git add" tells me how many files are added with the actual pattern?11:53
← psankar left11:53
→ mdr22 joined11:54
→ xelister joined11:55
xelister how to get 1.3 of debug kit? http://github.com/cakephp/debug_kit11:55
← Silex left11:56
→ kar8nga joined11:57
→ flaguy48 joined11:57
← bobself left11:58
← jony left11:59
engla enyovelcora: for starters, fetch, don't pull12:00
enyovelcora That's what I did now...12:01
Also started looking into rebase... which seems the more logical thing to do, but still gets me the merge conflicts12:01
→ jfkw joined12:02
engla you'll get the same conflicts basically12:02
you know if there are conflicts, you have to resolve them. git tracks your project, it's not some automated decision maker12:03
enyovelcora Isn't there a way to say: resolve all conflicts with the remote?12:03
engla you can file by file check out the "their" or "our" version12:03
enyovelcora I don't get how this even happens... I forked a project.. made 2 changes12:04
they are already pulled back in the main repo12:04
So, I have no changes on my own12:04
How can this result in so many merge conflicts?12:04
engla well then just throw away your fork and clone again? :-)12:04
divVerent enyovelcora: how did you provide the changes?12:04
enyovelcora I'm using github12:04
divVerent format-patch? or did they actually pull?12:04
enyovelcora I did a pull request12:05
divVerent oh... THEN I have no damn clue why this may happen :P12:05
enyovelcora And they pulled12:05
engla the code was subsequently changed then12:05
divVerent I wonder if they used the forbidden command with "r" :P12:05
engla the merge is just a three-way merge, it considers three versions, trees of file12:05
your version, their version and the common ancestor12:05
it doesn't go through the whole history to find patches that match12:05
divVerent engla: normally yes, but if they merged his commit, pulling from their repo would be fastforward12:06
engla yes of course, and that's not the case12:06
enyovelcora That's what I don't get: a new rebase or pull should just be fastforward12:06
divVerent can you check if your commits, in their repo, have the same commit hashes?12:07
engla well if it's not, it's not. there is a considerable freedom in how you might incorporate changes12:07
divVerent I bet they do not, causing the conflicts12:07
enyovelcora Ah you mean the didn't really pull my changes?12:07
divVerent yes12:07
they may have cherry-picked or rebased instead12:08
engla cherry-picking is often more convenient12:08
divVerent engla: personally, I prefer a direct merge12:08
even if it causes somewhta messy history :P12:08
I don't care how it looks in gitk, as long as git-bisect can grok it I am fine :P12:08
enyovelcora Ok... So what: the best way is to just delete my fork and fork again?12:08
divVerent enyovelcora: not delete, but essentially, yes12:08
you probably should git reset to "their" commit hash12:09
enyovelcora Ah...12:09
divVerent git reset --hard theirremote/master12:09
for example12:09
→ urkud joined12:09
enyovelcora THAT's what I've been looking for then I guess :)12:09
divVerent after that, a git push will likely fail12:09
you may need git push -f12:10
→ timofonic joined12:10
divVerent and yes, it IS bad to reset/rebase published history, but apparently you have no coice12:10
*choice12:10
because "they did it first" :P12:10
← zoniq left12:10
→ zoniq joined12:11
enyovelcora Wow git mergetool is getting funky!12:11
It's in an endless loop12:11
Wow.. had to kill it.. strange12:11
← Arelius left12:11
enyovelcora But, why is it bad in that case...12:11
I just want THEYR version.. make changes, and ask them to pull it12:12
→ Arelius joined12:12
→ Bass10 joined12:12
divVerent enyovelcora: it is bad if someone else has checked out your repo12:13
← kpreid_ left12:13
enyovelcora Yeah ok... that's very very unlikely :)12:13
divVerent then go ahead :P12:13
← voxpelli left12:14
qfr git pull requires a remote and a branch - what do I need to modify in my .git/config to have it default to a certain remote and a certain branch?12:14
branch.master.remote = <nickname>; branch.master.merge = <remote-ref>; remote.<nickname>.url = <url>; remote.<nickname>.fetch = <refspec>12:15
nickname refers to the name I have given to my remote?12:15
(in this case "github", or "origin", for example)12:15
enyovelcora divVerent: Oh no... github doesn't let me push non-fast-forward updates12:15
→ defectiv joined12:17
→ voxpelli joined12:18
← domcat left12:18
← tg left12:19
wereHamster qfr: yes12:19
qfr branch.master.[...] is equivalent to [branch "master"] I suppose?12:20
→ tg joined12:20
qfr Unluckily I have no branch sections in my .git/config, trying to google examples right now12:20
← zoniq left12:21
← mythos left12:21
wereHamster qfr: branch.master.remote is what you pass to git config (git config branch.master.remote origin)12:21
→ zoniq joined12:21
qfr Ahh12:21
wereHamster [branch "master"] is what you use in the config file12:21
qfr I always tend to edit it manually12:21
divVerent enyovelcora: then delete the branch, and recreate it12:21
qfr What do I probably want as <remote-ref>?12:21
wereHamster qfr: there is usually no reason for that, especially with something as common as setting the remote12:21
refs/heads/branchyouwanttomerge12:22
qfr wereHamster well I'd have to specify it every time I pull otherwise12:22
I guess it's because my remote is called github and not origin12:22
Because it defaults to origin?12:22
wereHamster I don't think pull defaults to anything if the config file doesn't tell it what to do12:23
qfr Oh you mean it's not necessary to specify the remote ref there? Ok12:23
→ jony joined12:23
wereHamster either you specify that on the commandline or pull reads it from the config file12:24
but if it's not specified in either, pull aborts12:24
qfr Ah, cheers, it works after specifying remote (github) + remote-ref (master)12:25
← naeu left12:25
← galderz left12:25
→ naeu joined12:27
jonalv` → jonalv12:27
→ koki joined12:27
koki hey, is there a config setting to tell git to always --track remote branches that i check out?12:27
← gabeodess left12:28
← Arelius left12:28
→ Arelius joined12:28
→ MrSamuel joined12:29
MrSamuel I have a project which is currently branch master12:29
Can I move everything to a new branch called development12:29
and then clear out branch master?12:30
wereHamster koki: git --version ?12:30
→ domcat joined12:30
wereHamster MrSamuel: how 'clear out' the master branch?12:30
koki wereHamster: 1.7.012:30
MrSamuel wereHamster: It might seem stupid, but this project has a large history of crap code and I don't want to publish it12:31
wereHamster koki: git already does that (try git checkout <somebranch> where <somebranch> is a remote tracking branch)12:31
MrSamuel: so what exactly do you want to do with the master branch?12:32
koki wereHamster: Note: moving to 'origin/PageCache' which isn't a local branch12:32
wereHamster koki: git checkout PageCache12:32
MrSamuel wereHamster: make it the "development branch" and kick off a new master branch12:32
← zoniq left12:32
wereHamster MrSamuel: git branch development;12:32
→ zoniq joined12:33
→ CWardUSC joined12:34
MrSamuel wereHamster: ok12:34
koki wereHamster: nice!12:34
and when i push the branch, how do i set it up to auto-track it?12:34
a new one, that i create locally?12:34
wereHamster push it where?12:35
koki to origin in this case12:35
→ mythos joined12:35
→ fcoury joined12:35
→ camonz joined12:35
cYmen What's a detached worktree?12:36
wereHamster git did set up branch tracking when you checked out that branch12:36
cYmen: faq detached12:36
Gitbot cYmen: You are on a detached HEAD and might lose commits.. See https://git.wiki.kernel.org/index.php/GitFaq#detached12:36
koki wereHamster: no, i created a branch locally, git checkout -b new_branch12:36
no i want to push that to origin (to go home) ... and next morning, i want to pull from my home changes12:37
wereHamster koki: http://pastie.org/92961512:37
koki: ah, you mean you created a new local brnach and want to push it to origin?12:38
→ btsteve_ joined12:39
koki wereHamster: YES, you got me now12:39
i can of course say git push origin feature:feature12:39
wereHamster koki: git push --set-upstream origin new_branch12:39
← linduxed left12:40
← MrSamuel left12:40
→ galderz joined12:40
koki wereHamster: thx --set-upstream is the one12:41
← btsteve_ left12:41
→ Sigma joined12:42
cYmen wereHamster: can you check if that's actually the same detached worktree as this guy http://toroid.org/ams/git-website-howto is talking about please12:42
It sounds like they might mean different things...12:42
wereHamster cYmen: no, he means that the working tree and .git are in different directories12:43
← Arelius left12:43
→ Arelius joined12:44
→ auslander joined12:44
← auslander left12:44
→ auslander joined12:44
→ kpreid_ joined12:45
cYmen ah12:46
→ bauruine joined12:48
→ rolfb joined12:48
→ gh34 joined12:49
← adaro left12:52
→ aspotashev|eeepc joined12:53
→ t0rc joined12:54
→ alester joined12:54
← Arelius left12:59
→ Arelius joined12:59
→ RandalSchwartz joined12:59
← RandalSchwartz left12:59
→ RandalSchwartz joined12:59
→ merlin83 joined13:00
← merlin83 left13:01
→ merlin83 joined13:01
→ disappearedng__ joined13:01
← alester left13:01
→ k0001 joined13:01
→ rduplain joined13:01
← rgr_ left13:02
→ j416 joined13:04
← j416 left13:04
← disappearedng left13:04
→ NET||abuse joined13:04
← disappearedng_ left13:05
→ stringo0 joined13:05
→ bsnyder joined13:05
→ roop_ joined13:08
← disappearedng__ left13:08
← roop left13:09
→ jayne joined13:09
→ Hunner joined13:11
→ Pupeno joined13:11
← stringo0 left13:11
← roop_ left13:12
← Remixman left13:12
→ Remixman_ joined13:12
← jmut left13:13
Remixman_ → Remixman13:13
→ HG` joined13:13
→ roop_ joined13:13
← Arelius left13:14
→ Arelius joined13:14
← aziz left13:14
→ eli joined13:15
→ onigiri_ joined13:17
→ roop__ joined13:18
→ christophsturm joined13:18
← roop_ left13:19
→ Sr_X joined13:19
→ stringo0 joined13:19
← jomofo left13:21
← navetz left13:22
→ joeconyers joined13:23
→ gregg joined13:23
← gh34 left13:23
← bentob0x left13:25
gregg msysgit / plink on windows question... in git bash (newly set up), trying to clone a repo from githb: get The server's host key is not cached in the registry.13:25
→ brodyberg joined13:25
→ wylecoyote joined13:25
divVerent gregg: simplest solution: start putty, connect to the server once, click yes on the host key dialog question13:26
gregg fair enough :)13:26
will try, report back13:26
divVerent it SHOULD be easier, but if it were, you'd already have found it :P13:26
← cilly left13:27
gregg divVerernt, works perfectly (github, already had keys set up). Thanks. I'm trying to get it working on windows "for a friend" (shamefully!).13:27
divVerent oh, and when going my route: you won13:28
't be able to log in. Ignore that :P13:28
all that counts is the host key unknown, yes/no dialog :P13:28
gregg correct, that dind't surprise me, and I've done it from unix before, so no worries, but a good caveat13:28
wylecoyote so I had a file in a repo, and now I've decided to add it to the gitignore list, so I edit .gitignore and add a line config/environment.rb and then I do git add .;git confirm -am "added ignore file"; git push origin master. Then on the client I do git pull, and I get this: http://pastebin/c8XcvF3V13:29
→ ilteris_ joined13:30
← Arelius left13:30
→ Remixman_ joined13:30
← rolfb left13:30
← Remixman left13:30
→ tzafrir joined13:30
→ Arelius joined13:30
wylecoyote I think I'm missing a step13:30
gregg 2ndary msysgit windows... any fix ot getting symlinks in repos working?13:30
tzafrir another git-svn -related question:13:31
Remixman_ → Remixman13:31
tzafrir I'm trying to get 'git describe' produce a useful output for a repository that is a git-svn mirror of an original SVN repo13:32
→ ph^_ joined13:33
divVerent tzafrir: hehe, forget that... git svn cannot support git tags, as svn tags are just directories and git tags are essentially immutable13:33
→ flazz_ joined13:33
← flazz left13:33
divVerent you can however manually create git tags from the svn tags13:33
when you KNOW the svn remote won't change the content of the tag directory13:33
tzafrir Problem: "tags" are actually branches. I already create git tags automatically from those svn tags,13:33
divVerent and git describe still does not work?13:34
→ mefesto joined13:34
→ jony1 joined13:34
tzafrir http://gitorious.org/asterisk-tools/asterisk-tools/blobs/master/update_tags13:34
divVerent sure13:34
not sure if the -r is the right way, but essentially fine13:34
tzafrir What I wonder is: is there a simple enough method to generate a tag from the branching point from the branch?13:34
divVerent branching point?13:35
OH... so the tags were committed to in svn actually?13:35
and you instead want the tags to point to when they were initially created from in trunk?13:35
try: git merge-base refs/remotes/tags/whatever refs/remotes/trunk13:35
does that return the ref you want?13:35
*commit13:35
tzafrir in (that specific) svn repo a "tag" is created by first branching off the branch. I want to try to spot that exact branching point13:36
← osier left13:36
← jony left13:36
divVerent I suppose the merge-base is what you want13:36
← ph^ left13:36
divVerent given that merged-in commits to the branch will get a different commit hash in git, thanks to the commit message containing the svn revision :P13:36
→ Ryback_ joined13:37
divVerent merge-base of two commits is the closest common ancestor (basically)13:37
PerlJam but that won't be the same thing as locating a branch point in svn13:37
divVerent and as git-svn's history is not a DAG but a simple tree... the merge base should be just fine13:37
PerlJam but that won't *necessarily* be the same thing13:37
tzafrir divVerent, ok, thanks. That looks like basically what I wanted13:37
← Adaptee left13:37
divVerent PerlJam: when can it differ?13:37
← stringo0 left13:38
← zoniq left13:38
PerlJam divVerent: when you've merged13:38
tzafrir btw: repo in question: http://svnview.digium.com/svn/dahdi/tools/ (and others on that server)13:38
→ zoniq joined13:38
divVerent PerlJam: hm... when you merged in svn?13:39
that doesn't turn git-svn's history into a non-tree DAG13:39
git-svn's history is always a tree, as it doesn't detect merges13:39
PerlJam divVerent: in an svn universe, those are still separate lines of development. With git, the merge collapses the commits so that they appear in both branches, but there's only one set of commits, thus possibly moving the merge-base commit.13:40
wylecoyote how do I force git to pull?13:40
divVerent PerlJam: sure13:40
but we are talking about a pure git-svn managed repo :P13:40
once you do merges inside git, sure, the merge-base then no longer is the branch-off point13:40
→ AAABeef joined13:40
PerlJam divVerent: sure ... until we're not. I like to make sure the caveats are out front for when people omit information in their problem description13:41
tzafrir well, I keep the svn branches clean13:41
← wylecoyote left13:41
→ rgr_ joined13:41
divVerent IIRC one MUST keep the git-svn managed branches clean anyway13:41
and base one's own work as extra branches on them13:41
→ altrux joined13:41
divVerent otherwise git svn will happily overwrite the refs :P13:41
tzafrir svnmerge is used in various branches. But I suppose git-svn does not count those as merges13:41
divVerent yes13:41
it does not detect these13:42
← ph^_ left13:42
divVerent but if it DID, there would be no concept of a branchpoint in git any more13:42
as git doesn't remember when a branch was where on the remote13:42
(the reflog is local to each repo)13:42
→ ph^ joined13:42
divVerent basically, finding "the" branchpoint in git is impossible13:42
as that info is simply not stored (apart from the auto-expiring reflog)13:43
← ph^ left13:43
divVerent this BTW is a minor annoyance for gitk users and should maybe be fixed in the future :P13:43
← defectiv left13:43
divVerent it's not always trivial to follow the development of a branch directly13:43
once merges happen13:43
→ schacon_ joined13:43
divVerent and sometimes info needed for it is missing, which is why gitk doesn't even try :P13:44
→ [Po]lentino joined13:45
→ spearce joined13:45
← Arelius left13:45
→ kbrandt joined13:45
→ Arelius joined13:45
kbrandt Is it possible to grep through all revisions?13:46
← zoniq left13:47
→ zoniq joined13:48
→ nevyn^ joined13:49
← zuez__ left13:50
← zoniq left13:51
→ zoniq joined13:51
← spearce left13:52
→ spearce joined13:52
← caseyw left13:52
→ TeckniX joined13:53
← zoniq left13:54
→ zoniq joined13:54
← cbreak_work left13:55
→ marshall joined13:57
← schacon_ left13:58
← zoniq left14:00
← Arelius left14:00
→ Arelius joined14:01
→ Aciid joined14:01
→ zoniq joined14:02
Aciid hey how can I findout remote git repo size?14:02
→ MattDeKrey joined14:02
posciak Aciid: do you have ssh access?14:03
→ gaveen joined14:03
Aciid posciak: no, I would have used du -h if I would have access14:03
but I'm interested is it possible with git client :\14:03
← ilteris_ left14:04
Aciid I'm downloading chromiumos.git and I'ts ~1.2gb now, no idea how big it really is14:04
posciak Aciid: no idea then, sorry14:05
Aciid damn :\14:05
→ icefox joined14:07
← roop__ left14:07
→ ShooterMG joined14:08
← jony1 left14:09
→ eshira joined14:09
eshira say I am at commit A. I do some (unstaged/uncommitted) modifications. I realize that I wanted to branch with A as the parent, but I want the new branch to have the uncommited modifications I just did. Is this possible?14:10
PerlJam eshira: just make a branch and commit your changes14:11
RandalSchwartz git branch foo14:11
git commit14:11
yeah, what pj said14:11
eshira well that works14:11
RandalSchwartz of course :)14:11
→ altogether joined14:12
eshira i guess i assumed that you needed to commit your stuff before branchign14:15
← przemoc left14:15
← merlin83 left14:15
← zoniq left14:15
PerlJam eshira: nope.14:15
→ zoniq joined14:15
RandalSchwartz you *could* of course.14:16
PerlJam eshira: you can also use "git stash" to squirrel away your changes if you don't really want a branch14:16
RandalSchwartz that would have looked like...14:16
git commit14:16
git branch otherbranch14:16
git checkout firstbranch14:16
git reset --hard HEAD~14:16
→ zehrique joined14:16
→ j416 joined14:17
← Arelius left14:17
← gebi left14:17
→ kukks joined14:17
→ Arelius joined14:17
← TheNewAndy left14:18
← opalka left14:19
← chittoor left14:21
RandalSchwartz wanders off14:21
eshira i see, thanks14:21
← eshira left14:21
→ przemoc joined14:22
→ Yuffster joined14:22
← zoniq left14:23
→ zoniq joined14:23
← leo2007 left14:23
→ ph^ joined14:24
← aspotashev|eeepc left14:24
→ unix_remote joined14:25
← zoniq left14:25
← reprore_ left14:25
→ zoniq joined14:25
→ alester joined14:25
→ reprore joined14:26
← reprore left14:26
← gnufied left14:27
← domcat left14:29
← coppro left14:32
← Arelius left14:32
← naeu left14:32
→ Remixman_ joined14:33
→ Arelius joined14:33
→ naeu joined14:33
← Remixman left14:33
Remixman_ → Remixman14:33
← altogether left14:34
→ infogulch joined14:34
→ altogether joined14:35
→ malesca joined14:36
← timj_ left14:37
← zoniq left14:38
malesca When I rename a file to change the case, git doesn't notice (git status lists no changes). I have "[core]\nignorecase = false" in my .gitignore. git 1.6.6.1. Any ideas?14:38
OS X14:38
→ zoniq joined14:38
→ sagsousuke joined14:38
→ tedoc2000 joined14:39
← Remixman left14:39
engla Your filesystem is case-insensitive (probably) so maybe it's not a surprise14:39
malesca duh, nevermind. ignorecase was true in .git/config14:39
→ Remixman joined14:39
malesca engla: Thanks. Yeah, that's why I mentioned OS X. It's hopefully this, though.14:39
engla I didn't know git had config for this so14:40
← bauruine left14:40
→ ben_h joined14:40
malesca Works now.14:40
← MattDeKrey left14:41
malesca And when I said .gitignore above, I meant ~/.gitconfig, of course.14:41
Ilari BTW: Anybody got an idea what's going on here: 'git reflog show refs/tags/JPC-RR-r10' -> '133ec87 26d161f 8d82d57 25cee55 6d7c8a9 46be12e ec4c04a 1cc8014 bfef063 25ff4e0 204b247 eded343 062c47d <and so on...>'. Tags don't seem to have reflogs and those IDs look like commit IDs...14:43
← zoniq left14:44
→ icwiener joined14:44
→ zoniq joined14:44
→ Remixman_ joined14:46
← Remixman left14:46
→ ijuma_ joined14:46
← zoniq left14:48
→ zoniq joined14:48
← Arelius left14:49
→ Arelius joined14:49
← vu3rdd left14:49
→ timj_ joined14:50
← zoniq left14:51
← Remixman_ left14:51
→ Remixman_ joined14:51
→ schacon_ joined14:51
→ zoniq joined14:52
← zoniq left14:53
→ zoniq joined14:54
→ Remixman joined14:56
← zoniq left14:56
→ jtauber joined14:56
← agile left14:57
← Remixman_ left14:57
← jtauber left14:57
← sde_antrix1 left14:57
→ zoniq joined14:57
← kpreid_ left14:58
← icwiener left14:58
← khelll left14:59
← skoop left14:59
← zoniq left15:00
→ kpreid_ joined15:01
→ iaefai joined15:01
→ Remixman_ joined15:01
← Remixman left15:01
avar Can I get a log of all revisions known in the repo, ordered by date (not just on a branch)15:02
← flazz_ left15:02
→ zoniq joined15:03
→ lemonchicken joined15:04
← rgr_ left15:04
→ Remixman joined15:04
→ ShaunR joined15:04
← ShaunR left15:04
→ ShaunR joined15:04
← tro left15:04
← kbrandt left15:04
→ disappearedng joined15:05
→ tro joined15:05
← jonalv left15:05
← Arelius left15:06
→ Arelius joined15:06
wereHamster avar: git log --all --date-order15:06
← Remixman_ left15:07
wereHamster puh, was that easy ;)15:07
AlericInglewood I want to apply the diff of a single commit to my current working tree, how can I do that?15:07
← EricInBNE left15:08
wereHamster AlericInglewood: where do you have that diff? DOes it come from another commit?15:08
→ khelll joined15:08
AlericInglewood I thought I did this right last time, but I ended up with partly inversed patches :/15:08
The commit is at say SHA1 wereHamster15:08
and I want to apply to whereever I'm now.15:09
jY AlericInglewood, cherry-pick if its on the origin15:09
← zoniq left15:09
wereHamster AlericInglewood: yeah, use cherry-pick15:09
AlericInglewood I used cherry-pick last time and the result was not what I wanted :/15:09
← christophsturm left15:09
→ christophsturm joined15:09
AlericInglewood What I'm doing is this:15:09
I have the history: A - B - C - D .. etc15:10
→ zoniq joined15:10
→ ksn joined15:11
AlericInglewood and I am splitting up each commit manually in many different 'topics', at first by creating branches topic/A1, topic/A2, topic/A3 etc at A, and topic/B1, topic/B2 etc at B.15:11
← giallu left15:11
AlericInglewood When I tried to cherry pick B, I ended up with the inverse of A as well as B :/15:11
avar wereHamster: thanks15:12
wereHamster cherry-pick does exactly what you asked for: it takes the diff of the commit and applies it to your current working tree and index15:12
→ ambuli joined15:12
← zoniq left15:12
ambuli → jelari15:12
AlericInglewood So, now I'm in a partial copy B - where parts have already been staged and committed as topic/B1, and I need to apply the commit topic/A1 to it, because that was inversed.15:12
copy of*15:13
jelari → ambuli15:13
fcoury → fcoury|away15:13
→ zoniq joined15:13
← christophsturm left15:14
← Remixman left15:14
→ Remixman joined15:14
← raichoo left15:14
→ j0shua joined15:14
→ CosmicRay joined15:16
j0shua I am trying to "git commit" and I get tons of: * trailing whitespace (line 137) even though i set "config --gloabel apply.whitespace nowarn" I also tried as fix. what do i need to do ?15:17
← zoniq left15:17
CosmicRay Hi folks. I've got several repos like this: my local machine contains several branches, each of which tracks a branch by the same name on origin. I frequently need to pull updates for each from origin. It is a true hassle to checkout each branch and pull/merge manually. Is there any trick to say "pull all tracking branches"?15:17
← naeu left15:18
→ zoniq joined15:18
shruggar CosmicRay, no. Though you're welcome to not pull until you actually want to15:18
CosmicRay shruggar: I don't follow the comment about not pulling until I want to?15:19
shruggar as in, why are you switching to each branch and pulling all the time? If you find that to be a hassle, don't do it15:19
← carl- left15:20
← radarek left15:20
CosmicRay ah. because I have others that are pushing changes there, which I need to work with and merge in various ways15:20
← Zephyrus left15:20
→ fool__ joined15:20
← fool__ left15:20
→ fool__ joined15:20
← meanburrito920 left15:20
j0shua when i try to commit into my proj i get " * You have some suspicious patch lines:" and tehn a slew of trailing whitespace (line 137) how do i ignore this and run my commit ?15:20
shruggar CosmicRay, well how about not pulling until you're working with them, and then only when you actually want other people's changes?15:21
CosmicRay the reason I'm pulling is because I need to be working with them ;-)15:21
shruggar CosmicRay, okay, so your situation is that you have lots and lots of separate repositories and you work with them all simultaneously?15:22
CosmicRay er no. branches.15:22
← Arelius left15:22
→ Arelius joined15:22
shruggar okay, so that's my point. Why do you want to pull before you would normally be switching to one of those branches anyway?15:23
→ _iron joined15:23
CosmicRay I could give a bit more detail perhaps. There are some software packages for which I'm the upstream author. I am also part of a Debian team that maintains these packages for Debian. I have an "upstream" branch for my original code. There are also "master" and "pristine-tar" branches that Debian developers commit to. In order to build a Debian package, all three branches must be up to date.15:23
shruggar I suppose I'm confused by "It is a true hassle to checkout each branch and pull/merge manually", when a normal workflow would mean something more like "It is a true hassle to pull/merge manually for every branch I check out"15:24
← auslander left15:24
→ auslander joined15:24
← auslander left15:24
→ auslander joined15:24
CosmicRay I am not sure I am grasping the difference.15:25
shruggar okay, so you have some automated script or something like that which looks at all the different branches at the same time?15:25
CosmicRay for building the Debian packages, yes.15:25
→ cilly joined15:26
→ webchick joined15:26
← schacon_ left15:26
shruggar okay. This doesn't help you at all, btw. I was just wondering what your situation was where this would come up. The answer is still "no, there's not really anything for automatically merging a bunch of things at once"15:26
→ iatrou joined15:26
→ agile joined15:26
CosmicRay ok. guess I can write something with for15:27
PerlJam wonders what it means to be looking at multiple branches "at the same time"15:27
shruggar If you want, I could spend five seconds writing a one-liner which would do it for you, but I get the impression that as a maintainer of various things, you were already aware of that option and wondered if others had solved the problem already :)15:27
CosmicRay shruggar: exactly15:27
PerlJam you can only ever have one branch checked out in your working copy anyway15:27
CosmicRay I'm thinking along the lines of git fetch origin; for ASDF in `git branch | sed 's/\*//g'`; do git checkout $ADSF; git merge origin/$ASDF; done15:28
PerlJam: of course. but you can generate diffs between branches.15:29
shruggar PerlJam: if he has some script which operates on all three branches through a single firing, then to him they all need to be in-sync "at the same time"15:29
CosmicRay git push --all is very handy for this stuff15:29
alas git pull --all doesn't do the same thing at all15:29
← zoniq left15:30
n3kl Somehow, the commit I want is master^, which got overwritten by master. Is there a way to promote it or somethign?15:30
→ karpar joined15:31
CosmicRay git reset --hard master^15:31
n3kl If I do git checkout master^, the file structure is like I want15:31
CosmicRay beware that you will lose anything more recent than master^ though15:31
→ zoniq joined15:31
→ kipras joined15:32
→ theZagnut joined15:32
n3kl cool15:32
do I need to commit after that?15:32
shruggar be aware that "lose" means "will need to use the reflog to get back to"15:32
no15:32
CosmicRay right15:32
n3kl Sweet. Thank you15:33
→ jrmuizel joined15:33
→ [Po]lentino_ joined15:35
AlericInglewood How can I collapse the last two commits into one?15:36
← [Po]lentino left15:36
shruggar two options: git reset HEAD~2 && git commit; or (more generic and feature-rich): git rebase -i HEAD~215:37
← karpar left15:37
shruggar probably many many more options, really15:38
rebase -i is the favorite, though15:38
← zoniq left15:38
→ zoniq joined15:38
← Arelius left15:38
shruggar git reset HEAD^ && git commit --amend, would also tend to be what is wanted15:39
→ Arelius joined15:39
← zoniq left15:40
← t0rc left15:40
→ zoniq joined15:41
→ defectiv joined15:41
→ AaronMT joined15:42
→ sjokkis joined15:42
→ Zephyrus joined15:42
→ jay-mccarthy joined15:43
sjokkis hi. i've been working on features in two separate files in a branch, and i've introduced a bug in one of them. i know for a fact that the other one is okay. is it possible to merge the file that's okay back to master, without doing a full merge?15:43
← novas0x2a left15:44
← zoniq left15:44
← galderz left15:44
→ zoniq joined15:45
shruggar sjokkis, if you committed the bugfix in its own commit, you can cherry-pick the bugfix15:45
→ aziz joined15:45
sjokkis shruggar: my changes the file1 and file2 are in the same commit15:46
→ leo2007 joined15:46
sjokkis file1 has a bug15:46
← enyovelcora left15:46
sjokkis i want to merge file2 back to aster15:46
master*15:46
Ilari sjokkis: Merge can't be done unless you split the changes somehow (by history editing).15:46
shruggar in that case no, there's no direct way.15:46
sjokkis splitting the history works...15:47
how is it done?15:47
→ poseid joined15:47
→ \mjd joined15:47
Ilari sjokkis: Interactive rebase likely (watch out, if others have the branch, they are going to get nasty surprise).15:47
j0shua how do i fix * You have some suspicious patch lines: * trailing whitespace (line 72) * trailing whitespace (line 172) ...... ??15:48
poseid I get a /usr/lib/git-core/git-pull: 163: tr: not found, when trying to git pull origin master....15:48
\mjd I have a failed merge and the merging will be complicated. A wanted to use "ediff", and I hoped it would have a mode where it deals with a single file that is in conflicted-merge format. But it seems it only deals with two separate files.15:48
j0shua it is not letting me commit NEW files beacuse of suspisious patch lines ?!?15:48
Ilari poseid: What OS?15:48
→ Remixman_ joined15:48
poseid 2.6.31-16-server #53-Ubuntu15:48
→ reprore joined15:49
sjokkis Ilari: thanks. second question. when i've got uncommited changes, how can i compile my code while ignoring those changes?15:49
\mjd I could reset the merge, and use ediff to merge the two different versions of the file but it seems a little silly when the conflicts are already written out.15:49
← Remixman left15:49
Ilari poseid: How did you end up with system with no tr? Try running 'tr' from command line?15:49
→ mw joined15:49
Ilari sjokkis: Stash them first.15:49
sjokkis thanks15:49
← zoniq left15:49
poseid I see... it's a test system, I am helping to debug... will pass the problem to the dev team....15:50
→ zoniq joined15:50
Ilari poseid: I thought one couldn't install system without having 'tr' installed (unless it is seriously stripped and one should know what one is doing if so).15:50
← reprore left15:51
→ shennyg joined15:51
poseid let's see what the dev team says.... maybe they are on diet...15:51
shruggar I'd guess path problems, overzealous security settings15:51
← voxpelli left15:52
sjokkis Ilari: works like a charm. thank you15:52
at first i thought git was bloody voodoo, but it has a few features i don't know how i managed withoutt15:53
→ psankar joined15:53
← psankar left15:53
→ psankar joined15:53
← zoniq left15:54
shruggar git /is/ voodoo. The only difference is: the wild claims are true15:55
→ zoniq joined15:55
← Arelius left15:55
→ Arelius joined15:55
sjokkis shruggar: this incremental merge worked out splendidly. found the bug, and it was NOT where i thought it would be15:56
← froschi left15:57
AlericInglewood oops15:58
← Dieterbe left15:58
AlericInglewood I typed: git stash clean15:58
How can I revert that?15:58
← sh1mmer left15:58
AlericInglewood (I wanted to type git stash clear)15:58
→ galderz joined15:59
AlericInglewood Now it said Saved "On current: clean" and my working directory is clean :/15:59
Oh... it's the same as git stash save clean I guess... so just an apply should work.16:00
shruggar usually "pop", rather than "apply", is what you want16:00
→ gebi joined16:00
→ Remixman joined16:01
← Remixman_ left16:01
→ schacon joined16:02
→ airborn joined16:02
→ aspotashev|eeepc joined16:02
→ unixtippse joined16:03
← nevyn^ left16:03
← sagsousuke left16:03
→ sh1mmer joined16:04
AlericInglewood How can I change the comment of a commit?16:05
→ Remixman_ joined16:05
j416 AlericInglewood: if it's the last commit, you can do: git commit --amend16:05
if it's not the last commit, you cannot, unless you alter history. Check man git-filter-branch16:06
Gitbot j416: the git-filter-branch manpage can be found at http://git.or.cz/man/git-filter-branch16:06
← Remixman left16:06
AlericInglewood The last on that branch you mean?16:06
j416 also man git-rebase16:06
Gitbot j416: the git-rebase manpage can be found at http://git.or.cz/man/git-rebase16:06
j416 AlericInglewood: most recent, yes16:06
← fmardini left16:06
→ lhz joined16:06
← infogulch left16:07
→ infogulch joined16:07
→ novas0x2a joined16:08
→ psoo joined16:09
→ slonopotamus joined16:10
→ dreiss joined16:10
→ qrc1 joined16:10
← qrc1 left16:11
← kpreid_ left16:11
→ ilteris_ joined16:11
← Arelius left16:11
→ bradhaydon joined16:11
← bradhaydon left16:11
→ Arelius joined16:11
→ giallu joined16:12
← Remixman_ left16:13
shruggar agh,,, using svn is painful and annoying after git16:15
slonopotamus hehe. using <any other> scm is painful after git16:16
shruggar I just miss my index16:16
→ Remixman joined16:16
→ gnufied joined16:16
gebi shruggar: git-svn no option?16:16
slonopotamus so use git-svn16:17
← ilteris_ left16:17
← ksn left16:17
shruggar I use git-svn normally, but right now I'm working on the server where svn actually runs16:18
← Pupeno left16:19
[Po]lentino_ → [Po]lentino16:21
← Remixman left16:22
→ Remixman joined16:22
← _iron left16:24
→ enherit joined16:25
← Arelius left16:26
→ Arelius joined16:26
← tvw left16:27
→ bauruine joined16:28
→ Remixman_ joined16:29
AlericInglewood When I do 'git add -i', and then choose "5: patch", can't I select more than one file and do all the hunks in one session? I keep forgetting what file I did last so it's annoying I can only select one file at a time.16:29
← cmoney left16:29
_rane gw2 ois varmaa jeee16:29
← Remixman left16:29
→ stringo0 joined16:30
shruggar AlericInglewood, just type "git add --patch"16:31
→ raichoo joined16:31
→ AkumaStreak joined16:32
→ countd joined16:33
← AAA_awright left16:33
→ AAA_awright joined16:34
← Remixman_ left16:35
→ rseifert joined16:35
← gnufied left16:35
← simplechat left16:35
← stringo0 left16:36
→ masterkorp joined16:37
→ merlin83 joined16:37
← hyperair left16:37
← merlin83 left16:37
→ merlin83 joined16:37
→ Nemurenai joined16:38
← altogether left16:41
← Arelius left16:42
→ Arelius joined16:42
← mastro left16:43
→ stringo0 joined16:43
→ darwin_ joined16:43
← joeconyers left16:44
← ajpiano left16:45
→ Theravadan joined16:45
→ altogether joined16:45
→ alley_cat joined16:45
→ gnufied joined16:46
→ ajpiano joined16:46
→ thiago_home joined16:48
→ ProperNoun joined16:48
← ProperNoun left16:49
→ ProperNoun joined16:49
→ Belna joined16:50
← shruggar left16:51
← Heimidal left16:51
← ProperN[out] left16:51
→ vu3rdd joined16:51
← poseid left16:51
→ justin-george joined16:52
← theZagnut left16:52
← justin-george left16:52
← d0ugal left16:56
→ d0ugal joined16:57
← webchick left16:58
→ disappearedng_ joined16:58
← wolog left16:59
→ kpreid_ joined16:59
→ Pupeno joined16:59
← zoniq left16:59
→ zoniq joined17:00
← Arelius left17:00
→ Arelius joined17:00
→ xiong joined17:00
← galderz left17:00
← Zephyrus left17:01
→ vinse joined17:02
← xelister left17:03
← Nemurenai left17:04
← [Po]lentino left17:05
← khaase left17:06
← Pupeno left17:06
→ Pupeno joined17:07
→ user_ joined17:07
← bluenovember left17:08
→ brizly joined17:09
← saLOUt left17:09
← petercoulton left17:10
→ petercoulton joined17:10
→ radioman-lt joined17:11
→ tvw joined17:11
engla AlericInglewood: git add -p17:11
← slonopotamus left17:12
← petercoulton left17:13
→ petercoulton joined17:13
← curtana left17:14
\mjd I did git diff -- foo BRANCH:foo and got no output. But the two versions of that file are surely different, and when I do git show BRANCH:foo | diff -u foo - , I see the expected differences.17:15
What is the first one doing?17:15
Oh, it's the -- screwing it up.17:16
← Arelius left17:16
→ Arelius joined17:16
\mjd But why no output?17:16
→ meanburrito920 joined17:16
← petercoulton left17:17
← dreiss left17:18
→ petercoulton joined17:18
← Gitzilla left17:18
→ disturb joined17:18
← petercoulton left17:18
murbank Is there a way to convert line numbers in version foo~5 to equivalent line numbers in version foo?17:18
→ petercoulton joined17:18
← hakunin left17:19
DrNick murbank: no17:19
at least, not using git17:19
I'm not sure that anybody has written a tool to do that, actually17:20
← jrmuizel left17:20
GyrosGeier hmm17:20
DrNick beyond the usual graphical diff tools17:20
eco So I've been using git-svn for awhile and would like to switch over to just git. What's the proper way of doing this?17:20
GyrosGeier you could parse the "@@" lines from git diff17:20
crab \mjd: i don't know what it's doing, but i think you wanted: git diff master..branch -- foo17:20
GyrosGeier these have "old" and "new" line numbers17:20
for each chunk17:20
for anything finer than that, you need to look at the + and - lines17:21
murbank GyrosGeier: Yeah that's what I was thinking. I was hoping their was an easier or pre-cooked way.17:21
eco Do I just use the git repository git-svn created as a regular git repository?17:21
GyrosGeier no, but you could write one17:21
\mjd crab: Thanks!17:21
schacon i would assume one of the git difftool options would do that17:21
eco Make a clone of it and throw it up on the server?17:21
schacon git difftool master...master~517:21
→ friskd joined17:22
← user_ left17:22
schacon doesn't tkdiff3 do nice side by sides?17:22
→ wolog joined17:22
← Pupeno left17:23
murbank schacon: I need text: I have a bunch of line numbers that need to be updated to a new version.17:23
← psoo left17:23
schacon murbank: i have no idea what that means17:23
oh17:24
murbank schacon: "On line 45 in version foo~5" -> "On line 67 in version foo"17:24
→ Pupeno joined17:24
→ IslandUsurper joined17:24
→ wonder95 joined17:25
wonder95 is there a web tool for viewing a Git repo on the server?17:27
DrNick gitweb and/or cgit17:28
← enherit left17:28
→ markelikalderon joined17:28
← countd left17:29
← vinse left17:30
→ bentob0x joined17:30
→ enherit joined17:30
← psankar left17:31
→ Heimidal joined17:31
← Heimidal left17:31
→ Heimidal joined17:31
← Arelius left17:31
→ Arelius joined17:32
→ aresnick joined17:32
iaefai Is it possible to change a previous commit description? (about 4 commits back)17:34
← meanburrito920 left17:34
Chani iaefai: if you havn't pushed, then yes17:35
iaefai Everything is pushed17:35
RandalSchwartz then no17:35
RandalSchwartz grins17:35
RandalSchwartz a commit message is part of the sha1 calculation17:35
change it, you're changing the commits17:36
iaefai I see17:36
schacon iaefai: "git commit --allow-empty -m 'that previous commit message should really say XX'"17:36
iaefai schacon: It is a matter of extra spaces before the text that I would rather get rid of17:36
Something major17:37
schacon git commit --allow-empty -m 'that previous commit message should really not have so many spaces'17:37
done17:37
iaefai heh17:37
schacon lil git humor there17:37
i'm just cracking myself up this morning17:37
iaefai My git must be old, 1.6.6.2, if 1.7.0.5 is out17:38
RandalSchwartz I rebuild my git every morning.17:38
git version 1.7.1.rc2.7.g3e7f117:38
j416 iaefai: as long as nobody has pulled from it, you can force-push an altered history17:38
← Boriskr left17:39
j416 but if anyone has pulled, they will be confused as to why everything suddenly conflicts17:39
iaefai RandalSchwartz: A little frequent, eh?17:39
→ Boriskr joined17:39
→ psankar joined17:39
iaefai j416: Is there a way to determine if anyone has pulled? (github)17:39
schacon no17:39
iaefai The project isn't very old, maybe a week, but I have given out the address - but I don't think anyone has said anything about it17:40
← markelikalderon left17:41
schacon you can always just fix it with a rebase -i, force push the result and then email everyone to tell them about the update - that they might then need to cherry pick any changes they've made onto your new history17:41
depends on how savvy and widespread your users are17:41
→ csgeek joined17:41
j416 iaefai: moral of the story: don't push without being satisfied with your changes17:42
iaefai schacon: shouldn't have any users yet :p (no reason yet, not developed enough).17:42
j416: certainly17:42
How exactly does one change this stuff? I am willing to take the risk that nobody has pulled yet.17:43
j416 iaefai: man git-pull17:45
Gitbot iaefai: the git-pull manpage can be found at http://git.or.cz/man/git-pull17:45
j416 er, typo17:45
iaefai: man git-push17:45
Gitbot iaefai: the git-push manpage can be found at http://git.or.cz/man/git-push17:45
j416 check --force17:45
schacon iaefai: http://schacon.github.com/history.html17:45
j416 (-f)17:45
schacon that might help with the rewriting history portion17:46
← Arelius left17:46
j416 schacon: you should add the git filter-branch method of changing commit messages :)17:46
→ Arelius joined17:46
← onigiri_ left17:49
← tildeequals left17:49
→ tchan joined17:52
← masterkorp left17:53
← disturb left17:53
→ lamont joined17:55
→ riz2 joined17:58
iaefai I think I will forget about rebase and count my blessings.17:58
crab blessing 1: having forgotten about rebase17:59
← rseifert left17:59
→ lambda joined18:00
← maddog_ left18:01
→ adaro joined18:01
→ dj_tjerk| joined18:02
→ unreal_ joined18:02
← tvw left18:02
lambda hi all, I have question about converting svn repo to git, is there any way how to ignore some directories during import, let say, that original svn repo has three directories 'a', 'b', 'c' and I want to create git repo containing only 'b' a 'c'. Thanks for any pointers. ML18:02
← lamont left18:03
← Pupeno left18:03
← AAA_awright left18:03
← jay-mccarthy left18:03
← spearce left18:03
← jfkw left18:03
← joevano left18:03
← d1b left18:03
← dj_tjerk left18:03
← priidu left18:03
← unreal left18:03
← Madsy left18:03
→ mahound` joined18:03
unreal_ → unreal18:03
→ maddog_ joined18:03
iaefai crab: quite true :p18:03
← Arelius left18:03
→ Arelius joined18:04
← zoniq left18:05
→ peper joined18:06
j416 lambda: I have no idea about svn or git-svn, but you can, after you have imported everything, use git filter-branch to remove directories.18:07
lambda: man git-filter-branch18:07
Gitbot lambda: the git-filter-branch manpage can be found at http://git.or.cz/man/git-filter-branch18:07
→ lamont joined18:08
→ Pupeno joined18:08
→ AAA_awright joined18:08
→ jay-mccarthy joined18:08
→ spearce joined18:08
→ jfkw joined18:08
→ joevano joined18:08
→ d1b joined18:08
→ priidu joined18:08
→ Madsy joined18:08
→ yatiohi joined18:08
→ snucko joined18:08
→ Haarg joined18:08
→ Cap_J_L_Picard joined18:08
→ qfr joined18:08
→ sven^ joined18:08
→ Soliton joined18:08
→ adamholt joined18:08
→ tewk joined18:08
→ AlericInglewood joined18:08
→ Zeelot3k joined18:08
→ joel____ joined18:08
→ slowride joined18:08
→ nothingmuch joined18:08
→ emptyness47 joined18:08
→ Ingmar joined18:08
→ tpope joined18:08
→ dennda joined18:08
→ jpieper joined18:08
→ magcius joined18:08
→ PerlJam joined18:08
→ charon joined18:08
→ wereHamster joined18:08
→ redondos joined18:08
→ homa_rano joined18:08
→ j-o-f joined18:08
→ iff joined18:08
→ ice799 joined18:08
→ unpaidbill joined18:08
→ Garoth joined18:08
→ jnl joined18:08
← tar- left18:09
→ neutrino joined18:09
← emptyness47 left18:09
neutrino → tar-18:09
→ emptyness47 joined18:09
← cilly left18:10
lambda thanks I will check filter-branch, I just wanted to avoid import everything first18:10
→ Belna_ joined18:10
→ zhobbs_ joined18:10
→ krawek joined18:11
→ lambda_ joined18:11
→ kelvie joined18:11
zhobbs_ So I have deleted a file in my new branch (B), and someone makes a change into that file in the original branch (A)...how do I merge, so that this file I deleted stays deleted?18:12
→ webchick joined18:12
→ jakubzalas joined18:13
tty1 has anyone ever heard of git, git-daemon or gitosis causing a system to grind to a hault after a day or two?18:13
→ Alagar joined18:14
→ rubydiam_ joined18:14
← gnufied left18:14
← priidu left18:14
→ slonopotamus joined18:14
← infogulch left18:14
← Belna left18:14
thiago_home zhobbs_: when you do the merge, Git will tell you that there's a delete/modify conflict18:15
you must resolve it manually18:15
in your case, the resolution is git rm filename again18:15
j416 lambda: good luck. Sorry, I don't know a thing about git-svn or svn, so.. there might be a better way.18:15
zhobbs_ thiago_home: there are no merge strategies that would avoid this? I guess I can try some18:15
crankharder what'sa fast way to see the difference in commits for a given file?18:15
← lambda left18:15
thiago_home Git doesn't know what you want18:16
there are other resolutions for this18:16
like restoring the file18:16
\mjd crankharder: git log -- file18:16
→ radii joined18:16
thiago_home crankharder: git log -p -- file18:16
\mjd crankharder: git log -p -- file18:16
thiago_home crankharder: git diff commit1 commit2 -- file18:16
zhobbs_ thiago_home: hmm, looks like "ours" will do this...18:16
thiago_home zhobbs_: right, but ours discards changes to ALL files18:17
zhobbs_ yeah18:17
crankharder i need the difference in commits between two branches for a given file -- basically I forgot to merge something related to it18:17
crab i miss the p4 integrate UI sometimes.18:17
crankharder sorry, wans't clear enough the first time :)18:17
crab git diff branch1..branch2 -- given/file18:17
← rubydiam_ left18:17
→ rubydiam_ joined18:18
crankharder thanx18:18
→ kenyon joined18:19
crab maybe today is the day when git diff a..b -- c will be the answer to all questions.18:19
← Arelius left18:19
← slonopotamus left18:20
→ Arelius joined18:20
← alester left18:20
crab p4 integrate was like git merge + git add -p. it was great.18:20
→ mtkd joined18:21
→ tildeequals joined18:21
schacon spearce: btw, we got smart-http deployed at github now18:21
it seems to be working great18:21
← lambda_ left18:21
schacon thanks for all the work you did on that18:21
→ gnufied joined18:22
spearce woohoo18:23
jast cool18:23
→ flazz joined18:23
→ fargiolas joined18:23
→ dmg joined18:25
→ tanoku joined18:26
→ sirjanhenrik joined18:28
← vu3rdd left18:28
← JohnFlux left18:30
→ Nemurenai joined18:31
← j416 left18:32
→ arrenlex joined18:33
→ microm joined18:33
arrenlex I moved some files to a different folder and committed. Upstream, the exact same change was made and committed. I pulled. How do I merge conflicts? I tried doing 'git add -A .' on the root folder but it didn't work.18:33
→ rsewill joined18:35
crab why are there conflicts?18:35
microm is there a gitweb RSS feed that gives me all changes on all branches? It seems to be a "per-head" feed.18:36
→ khaase joined18:36
→ meanburrito920 joined18:36
← flazz left18:37
← xiong left18:37
← Arelius left18:38
← ijuma left18:38
arrenlex crab: Oh, nevermind... it wasn't quite the same move after all.18:38
← rsewill left18:39
← sirjanhenrik left18:39
→ Arelius joined18:39
← tg left18:41
← brodyberg left18:41
→ tg joined18:42
→ infogulch joined18:42
→ flazz joined18:43
→ Apocalisp joined18:44
Apocalisp OK, how do I abandon local changes to a file?18:44
← arrenlex left18:44
→ jrmuizel joined18:44
wereHamster Apocalisp: git checkout -- <file>18:45
← LRN left18:46
← AaronMT left18:47
→ psankar_ joined18:47
← psankar_ left18:47
Apocalisp wereHamster: I did that, but still getting Your local changes to Foo.scala would be overwritten by merge. Aborting. when pulling.18:48
← psankar left18:49
→ spaceonline joined18:49
wereHamster Apocalisp: git status18:49
→ markelikalderon joined18:50
→ LRN joined18:51
Apocalisp wereHamster: git status shows a bunch of untracked and another bunch changed but not updated.18:51
I desperately want Foo.scala to be overwritten by the merge.18:52
wereHamster it tells you what you can do to throw away these changes etc18:52
← steffkes left18:52
← HG` left18:52
Apocalisp wereHamster: It does say that, but it lies.18:52
git checkout -- Foo.scala18:53
Foo.scala shows up as modified before and after.18:53
wereHamster git reset -- Foo.scala (to unstage the changes), then git checkout -- Foo.scala18:53
Apocalisp No effect.18:54
wereHamster in which section does that file show up? Changes to be committed: or Changed but not updated: ?18:55
→ aheinecke joined18:55
Apocalisp changed but not updated18:55
I haven't staged this file18:55
wereHamster are you on windows?18:56
Apocalisp yes18:56
wereHamster then it's most likely a problem with automatic crlf conversion18:56
← Arelius left18:57
Apocalisp why would that be a problem in jettisoning changes?18:57
← mw left18:57
→ Arelius joined18:57
→ frakturfreak_ joined18:59
← frakturfreak left18:59
→ tvw joined19:00
Apocalisp that was it though19:00
→ danferranti joined19:00
Apocalisp I set it explicitly to false and the files no longer show up as changed19:00
Thanks, wereHamster19:00
← Apocalisp left19:00
→ dreiss joined19:03
→ psoo joined19:04
← tatsuya left19:04
← altogether left19:05
wonder95 if I get "fatal: index file open failed (Permission denied)" when I try to do anything to a repo, is there a particular file I need to check permissions on?19:05
← timofonic left19:06
← stamina left19:06
→ altogether joined19:07
→ timofonic joined19:07
← afrasi left19:09
SRabbelier → git|Srabbelier19:10
git|Srabbelier → git|SRabbelier19:10
← altogether left19:10
← Boriskr left19:11
→ khmarbaise joined19:12
→ erkkk joined19:13
→ priidu joined19:13
← djbpython left19:14
← killerchicken_ left19:14
→ killerchicken_ joined19:15
← Arelius left19:15
→ Arelius joined19:16
erkkk hi. does anyone have an idea why ssh may return "Unable to get term attr: Invalid argument"? I'm miserably trying to push to remote repo, no luck so far!19:17
← LRN left19:17
→ LRN joined19:22
→ krycek_ joined19:23
→ LiamH joined19:23
git|SRabbelier → SRabbelier19:23
krycek_ can git "clone" just one folder from a project like I used to do with SVN?19:23
← rubydiam_ left19:24
→ menace joined19:24
← meanburrito920 left19:24
Ilari krycek_: No.19:25
← j0shua left19:27
→ sgh joined19:29
→ masterkorp joined19:29
→ djbpython joined19:30
→ meanburrito920 joined19:33
→ hyperqbe joined19:34
← Arelius left19:35
→ Arelius joined19:35
hyperqbe whenever I want to do something that requires me to commit, I usually do git commit -a -m 'temp', then do my thing, and then git reset HEAD^. This works pretty well for me, but is there some benefit to using git stash instead?19:36
crab if you use git stash, the changes you were working on _won't_ be in your current checked-out tree.19:37
→ drizzd joined19:38
crab so a benefit might be that you don't have to make it compile before you make your tmp commit.19:38
another is that you can easily stash multiple things, and restore them independently.19:39
git stash is also shorter to type. :-)19:39
→ ProperN[out] joined19:40
\mjd the useful "git stash apply" operation is probably easier to execute if you actually use the stash.19:40
← erkkk left19:40
\mjd I often use it when I have made (but not committed) a bunch of changes, and I realize I'm working in the wrong branch,19:40
→ WALoeIII joined19:40
\mjd I stash, checkout new branch, stash pop.19:40
That would be harder with the commit temp approach.19:41
jast but for that you could use checkout -m instead :)19:41
crab another thing: "git stash branch x" allows you to restore your stashed changes in a new branch without conflicts, even if in your working branch you've made changes that would conflict with the stashed changes.19:41
mjd: you can just git checkout otherbranch, uncommitted changes will be merged into your new working tree by default.19:42
← bentob0x left19:42
← ProperNoun left19:42
jast crab: checkout normally only does a trivial merge. you need -m for it to do a full merge.19:42
← markelikalderon left19:43
← tildeequals left19:43
→ jmcantrell joined19:43
→ markelikalderon joined19:44
← markelikalderon left19:45
crab jast: if there are non-trivial conflicts, i personally prefer checkout otherbranch to fail safely and let me reconsider what i'm doing rather than running checkout -m always and then having to resolve or reset.19:45
jast yeah, always running checkout -m isn't that useful19:45
← krycek_ left19:45
jast I only recommended it as a replacement for stash/checkout/stash pop19:45
→ bewst joined19:47
← drizzd left19:47
bewst What is "REUC extension," and is there a way to get git to ignore it silently?19:48
← auslander left19:49
← kur1j left19:49
crab bewst: i'm afraid not.19:50
bewst argh; magit is choking on the message19:50
← rafalkoszyk left19:51
→ auslander joined19:51
← auslander left19:51
→ auslander joined19:51
crab bewst: from reading the code it seems you have an extension record in your index (of type REUC which apparently means resolve undo conflict, whatever that means), which your git doesn't understand.19:51
i'm puzzled by how that might happen. did you downgrade to an older version of git or something?19:52
bewst crab: nope19:52
crab but anyway, the warning is emitted unconditionally.19:52
when do you get this warning?19:52
← urkud left19:52
bewst crab: I do seem to have a few git executables though19:53
Ah, I have 1.6.1 in /usr/local/bin and 1.7.0.3 in /opt/local/bin odd19:54
crab that might explain it. perhaps you used a newer one at some point, and are now using an older one.19:54
← Arelius left19:54
dennda How do you do an svn merge via git svn?19:54
← d0k left19:54
← tg left19:54
→ tg joined19:55
→ Arelius joined19:55
bewst crab: that's it! Thanks a lot.19:55
→ urkud joined19:55
← sgh left19:56
← brizly left19:56
→ sgh joined19:56
← Aides left19:56
→ Aides joined19:56
→ florianb joined19:58
→ mw joined19:58
← mw left19:58
→ mw joined19:58
← bx2 left19:58
→ jboom joined19:59
← Nemurenai left19:59
← gnufied left20:00
← meanburrito920 left20:00
→ gwoo joined20:00
← IslandUsurper left20:01
← Belna_ left20:03
← jboom left20:03
← aresnick left20:03
→ eletuchy joined20:04
→ meanburrito920 joined20:04
→ dfghjkl joined20:05
← snucko left20:05
→ mdr22_ joined20:06
← petercoulton left20:07
← dfghjkl left20:07
← mdr22 left20:08
mdr22_ → mdr2220:08
murbank What is a good way to determine how my local repo differs from origin? (new branches, new commits)20:10
crab git fetch+git log20:10
→ tildeequals joined20:12
frakturfreak_ → frakturfreak20:13
→ vinse joined20:13
← Arelius left20:13
→ Arelius joined20:13
→ juro joined20:14
→ sixteneighty joined20:15
juro hi, I am pretty new to git (coming from svn). how can I ignore all folders named base? does "base/" in .gitignore handle that?20:15
→ carneades joined20:15
→ drizzd joined20:16
carneades hi, i'm writing a build script and i'd like to make a tag for the release, push the tag and push the changes into master20:16
but right now it will only do one or the other, and the second push gets "already up to date"20:16
i'm doing something like this: http://gist.github.com/37575820:18
→ johnw joined20:19
→ hagna joined20:19
hyperqbe carneades: i'm new to git, but i think that a tag has to point to an existing commit, so when you push the tag, you're automatically pushing the changes up to that tag20:19
→ bjornbjorn joined20:19
carneades right that's exactly what's happening20:19
it doesn't go into master20:19
hyperqbe: so i should commit, push to master, and then tag referencing that commit?20:20
→ henr_k joined20:20
← drizzd left20:21
hagna how do I keep a file in the repo with the version number in it as reported by git-descrive?20:21
descibe I mean20:21
gah20:21
→ drizzd joined20:21
hyperqbe these other guys can help you better... but are the changes in master on your local repository before the push?20:22
carneades yes, before the script starts i'm in master, the build script changes version numbers in various file automatically. then it commits those changes to my local master. then what i want to do is push to remote master and create a tag to mark the official release also on remote master20:23
nDuff hagna, that sounds to me like something I'd do in my makefile at build time.20:24
← meanburrito920 left20:24
crab carneades: tag the commit on the local master and push --tags to the origin.20:24
→ aresnick joined20:25
→ hegge joined20:25
← juro left20:26
hagna nDuff what if you are building a release that has not .git?20:26
carneades crab: is this what you have in mind? http://gist.github.com/37577420:26
hyperqbe: thanks anyway for your help, i appreciate it20:26
nDuff hagna, build your release tarballs with a makefile that creates that file.20:27
crab carneades: yes. does that not do what you want? in which case, i don't understand what you want.20:27
carneades crab: if push --tags will both put the tag on the remote and push my changes to master, then yes that's what i want20:28
→ traviscline joined20:28
crab yes, that's what it should do.20:28
carneades thank you very much for your help20:28
traviscline sitaram: is it possible to only allow deletion of all but some refs?20:28
in gitolite?20:28
← kpreid_ left20:29
hagna nDuff: good idea could I still use git archive to make the tarball? The version file would not be in the git tree I suppose.20:29
→ slonopotamus joined20:29
← johnw left20:29
← carneades left20:29
← zhobbs_ left20:30
→ kylehayes joined20:30
kylehayes is git pronounced "git" or "get"20:30
← Arelius left20:30
crab git20:31
hagna like it's spelled20:31
crab hagna: run git-archive --prefix=foo HEAD|tar xf -, then git-describe HEAD > foo/new-version-file, and tar cf release.tar foo/20:31
kylehayes ok, I was once told as get, but that always confused me20:31
thanks20:31
→ Arelius joined20:32
← mdr22 left20:32
→ johnw joined20:32
crab hagna: or look at gitattributes(5) and use that export-subst thing.20:32
→ mjf joined20:33
← ShaunR left20:35
← mythos left20:36
← mefesto left20:36
← DavidKlein left20:36
← aspotashev|eeepc left20:36
→ lanthan__ joined20:37
hagna crab: ok cool20:38
→ aspotashev|eeepc joined20:38
← auslander left20:39
← dmg left20:40
← lanthan_ left20:40
→ snitko joined20:41
← snitko left20:41
microm is there a gitweb RSS feed that gives me all changes on all branches? It seems to be a "per-head" feed.20:42
← florianb left20:46
← sixteneighty left20:47
→ bx2 joined20:47
← wonder95 left20:47
← tzafrir left20:47
← binjured left20:49
← Arelius left20:50
→ Arelius joined20:50
→ ilteris joined20:51
→ meanburrito920 joined20:51
→ mythos joined20:51
→ Nemurenai joined20:51
← ilteris left20:51
→ IslandUsurper joined20:51
→ Twisted_Mentat joined20:53
→ notjohn joined20:55
→ ksn joined20:56
← WALoeIII left20:56
→ WALoeIII joined20:57
← Aides left20:59
← cannonball left21:00
← lhz left21:01
→ hakunin joined21:02
→ d-snp joined21:02
← menace left21:02
→ wonder95 joined21:04
→ Aides joined21:07
← Arelius left21:07
← khmarbaise left21:07
→ Arelius joined21:08
← k0001 left21:09
← Nemurenai left21:10
← altrux left21:11
→ lambda joined21:11
→ pantsman joined21:11
lambda hi all, I am trying to remove some directories from repo based on howto http://dound.com/2009/04/git-forever-remove-files-or-folders-from-history/, everything work fine, just size of repo remains the same, what I am doing wrong? thanks in advance. ML21:13
← engla left21:14
pantsman titties21:14
doener lambda: should be "git reflog expire --expire=0 --all" (--expire=0 added), and (given a modern git version) "git gc --aggressive --prune=0"21:15
← jmcantrell left21:15
doener lambda: with an ancient git, use "git repack -adf --window=250 --depth=250" instead of "gc"21:16
← iaefai left21:16
wonder95 when I try to clone a repo to my laptop from a server over SSH using [email@hidden.address] I can clone, but I get "error: insufficient permission for adding an object to repository database ./objects" when I try to push21:16
and if I use ssh://git@mydomain.com, I get "ERROR:gitosis.serve.main:Repository read access denied"21:17
I have my keys specified in gitosis.conf, and the .pub keys are on the server21:18
what am I missing?21:18
jast probably write permissions are not configured correctly in gitosis.conf21:19
← icefox left21:20
→ icefox joined21:20
→ Zare joined21:20
wonder95 jast: I have "writable = myrepo.git" and members = mykey.pub" in there21:20
← tar- left21:22
← Zare left21:22
→ Nemurenai joined21:22
← bx2 left21:23
doener wonder95: IIRC you have to drop the ".pub" part21:23
→ stamina joined21:23
wonder95 doener: right, I don't have the .pub part in there - IRC type21:23
er, typo21:23
→ bx2 joined21:24
← aspotashev|eeepc left21:24
doener wonder95: and your ssh config is setup to use the right key? (assuming that you have more than one)21:24
← bx2 left21:24
→ neutrino joined21:24
neutrino → tar-21:24
→ aspotashev|eeepc joined21:24
← Arelius left21:25
← khaase left21:25
→ khaase joined21:25
→ Arelius joined21:25
wonder95 doener: hmmm ... is it true that you can't use the same key for Git and for connecting to the server21:25
doener not for the same user. But I guess I'm stupid. You got a gitosis error, so you must be using the right key, otherwise gitosis wouldn't be used at all IIRC21:27
cbreak I use the same21:27
for git and normal ssh21:27
doener wonder95: btw, if you're only starting out, you might want to use gitolite instead of gitosis21:27
wonder95 cool21:27
cbreak because git is built on top of normal ssh, that's not a problem21:28
→ Textmode joined21:29
← kar8nga left21:30
Ilari wonder95: Just pay attention to message it prints at end of install (or you get somewhat puzzling problems).21:33
Textmode morning all21:33
← raichoo left21:33
← khaase left21:36
traviscline is there a way to have reflog log all ref changes, including remote refs?21:36
Ilari traviscline: Well, remote tracking refs do have reflogs.21:37
traviscline oh, I mean if you delete a remote ref can the log stay around?21:37
← tbf left21:37
traviscline i had a somewhat scary situation where i accidentally the wrong remote branch21:37
and had to go to another clone to repush it21:37
← nbaum left21:37
→ bradman joined21:38
← camonz left21:39
← Nemurenai left21:39
← simNIX left21:39
→ GyrosGeier joined21:40
→ Espen-_- joined21:40
← radioman-lt left21:41
← Yuuhi left21:41
← doener left21:42
← Arelius left21:43
bradman Does anyone have any recommendations for git graphical frontends, aimed at novice git users? We have a mix of Mac and Windows PCs, do something that's cross-platform would be ideal. I've been testing out SmartGit (commercial) but was wondering about other options.21:43
→ ded` joined21:43
← aziz left21:43
→ doener joined21:44
Vampire0_ bradman, how about git-gui/gitk which are shipped with git? :-)21:44
→ Arelius joined21:44
ded` git branch -r is listing branches that don't really exist on the remote, despite git fetch. What's up?21:44
bradman Vampire0_:I'm just reading about those now...21:45
ded` I mean they use to exist, but no longer. How to force consistency?21:45
Vampire0_ ded`, man git-remote21:46
Gitbot ded`: the git-remote manpage can be found at http://git.or.cz/man/git-remote21:46
← masterkorp left21:46
← stringo0 left21:46
← gebi left21:47
ded` Vampire0_, ah prune right thanks.21:47
Vampire0_ you're welcome21:48
→ blaines joined21:48
→ byteframe joined21:48
AlericInglewood I have: A (<-tag:root) -- B -- C -- D -- E (<-branch:current), now I want to rebase the diff from D to E onto A21:49
If I do: git rebase --onto root D current21:49
what will happen to B -- C -- D ?21:49
→ docelic_ joined21:50
→ u_me joined21:51
→ stringo0 joined21:51
→ [J]stringo0 joined21:52
AlericInglewood I'll try:21:52
git checkout current21:52
git checkout -b topic/privacy21:52
git rebase -i --into root HEAD~1 topic/privacy21:52
--onto I mean21:52
u_me h i all21:52
→ ryan_scott joined21:53
← jrmuizel left21:54
AlericInglewood ok, that worked... now I want to erase the last commit on 'current'...21:54
Would that be: git checkout current; git reset --hard HEAD~1 ?21:55
Vampire0_ AlericInglewood, from the man git-rebase page I would say in your ABCDE example you get A -- E' from your command. If you want to have A -- D' -- E' I guess it would be "git rebase --onto root C current"21:55
Gitbot AlericInglewood: the git-rebase manpage can be found at http://git.or.cz/man/git-rebase21:55
sitaram traviscline: ping21:55
traviscline sitaram: pong21:55
AlericInglewood Vampire0_: no I just wanted the last (E)21:55
Vampire0_ ok21:56
but21:56
if you now remove the last commit on current current will point to A I think21:56
→ tzafrir joined21:56
Vampire0_ current should point to E' now21:56
If I got it correct21:56
→ gabeodess joined21:56
Vampire0_ gitk should verify that21:56
AlericInglewood I was afraid that I'd lose B-C-D21:56
← u_me left21:56
AlericInglewood So I created a new branch (topic/privacy) and rebased that.21:57
Now that worked I can delete the last commit on the 'current' branch21:57
Vampire0_ So topic/privacy points to E' and current still to E, correct?21:57
sitaram traviscline: pasting something; give me 2-3 min21:57
AlericInglewood yes21:57
Vampire0_ Then I think your reset command should do what you want21:58
gabeodess Hey guys, my server (running Ubuntu) looks like it is running an old version of git (1.1.3) and I think I'm having compatibility issues with capistrano. Can anyone tell me what the best approach would be to getting my git package updated?21:58
← lucsky left21:58
Vampire0_ though I'm also a git newbie :-)21:58
crab gabeodess: see if backports has a newer version21:58
Vampire0_ gabeodess, maybe updating Ubuntu? :-)21:58
1.1.3 is really old, so I guess your Ubuntu installation is also *g*21:58
gabeodess crab: what is backports? how do I check that?21:58
Vampire0_ ah, you have dapper drake installed21:59
← notjohn left21:59
← bradman left22:00
Vampire0_ that's really very old. But if you insist on continue using it, in the dapper-backports repository you have at least git 1.5.4.522:00
AlericInglewood What is the difference between HEAD^ and HEAD~1 ?22:00
Vampire0_ Which is still quite old now22:00
sitaram traviscline: http://pastebin.com/SBYcJNa0 -- you can delete any branch except b1; work from there22:01
Vampire0_ AlericInglewood, they reference the same22:01
traviscline sitaram: thanks22:01
sitaram: it didn't seem like i could do RWD, should i be able to?22:01
Vampire0_ gabeodess, http://packages.ubuntu.com/search?keywords=git-core&searchon=names&suite=all&section=all22:01
traviscline it said it couldn't make sense of it (1.4.1)(22:01
← JEEB left22:01
sitaram traviscline: and this was always possible, even with the old meaning of RW+ including delete22:01
crab gabeoddess: https://help.ubuntu.com/community/UbuntuBackports22:01
traviscline gotcha22:01
← bewst left22:01
← Arelius left22:02
→ JEEB joined22:02
Vampire0_ AlericInglewood, HEAD^ is the 1. parent (of multiple ones in case of a merge commit) HEAD~ is the 1. generation parent22:02
→ Arelius joined22:02
Vampire0_ AlericInglewood, man git-rev-parse shows all the ways to specify a rev with examples22:03
Gitbot AlericInglewood: the git-rev-parse manpage can be found at http://git.or.cz/man/git-rev-parse22:03
gabeodess Thanks Vampire0_. How do I check which version of ubuntu I have?22:03
avar gabeodess: "About Ubuntu"22:04
Vampire0_ you have dapper drake which is 6.06 LTS22:04
sitaram traviscline: the rules for "D" are described in commit message 2a776e and in doc/3 "separating delete and rewind rights"22:04
Vampire0_ avar, "About Ubuntu" on a server system? I doubt he has a running X there22:05
← khelll left22:05
sitaram traviscline: this is "pu"; not yet in master I think22:05
gabeodess I do not22:05
sitaram wait lemme check22:05
gabeodess Vampire0_: are you saying I have dapper drake?22:05
Vampire0_ gabeodess, besides believing me you can e. g. have a look at the file /etc/apt/sources.list22:05
gabeodess, Yes, I do22:05
gabeodess how do you know?22:05
← d0ugal left22:05
Vampire0_ Look at the page I gave you22:06
gabeodess I didn't tell you anything22:06
Vampire0_ You did22:06
You told me your git version22:06
gabeodess true22:06
→ altogether joined22:06
Vampire0_ dapper drake is the only one where 1.1.3 is available22:06
[00:01:30] <Vampire0_> gabeodess, http://packages.ubuntu.com/search?keywords=git-core&searchon=names&suite=all&section=all22:06
Vampire0_ → Vampire022:06
gabeodess Vampire0_: okay... does that mean I actually have the latest version of git for my version of Ubunto?22:07
ubuntu22:07
← danferranti left22:07
gabeodess ...which is why you said to update Ubuntu.22:07
← alley_cat left22:07
Vampire0 yes and no22:07
→ kylehayes_ joined22:07
Vampire0 you have the latest version of git in the "normal" repository22:08
you can have a newer version (which is still quite old) in the backports repository which provides backports of newer version that don't make it into the normal repository22:08
← Paraselene_ left22:08
Vampire0 I think the link crab gave you explains the principle22:08
→ Mage joined22:08
Vampire0 you should read the links ppl give you22:09
Updating Ubuntu is one way which has other advantages22:09
besides that I prefer Debian for server systems and Ubuntu only for end-user desktop systems22:09
You can also get the git sourcecode from the git git repository and build git yourself22:10
gabeodess can I update Ubuntu with apt-get? and do I have to worry about losing data on my server during the update?22:10
Vampire0 Then you have the very latest version22:10
gabeodess ahh22:10
that sounds good.22:10
oh man... I'm so in the dark about all this stuff.22:10
← hyperqbe left22:11
Vampire0 Then pay a well trained server administrator :-)22:11
← kylehayes left22:11
Vampire0 It has good reasons such guys are not too cheap ;-)22:11
gabeodess yeah... I keep telling my boss that.22:11
← kylehayes_ left22:12
AlericInglewood While being on the branch foobar, how can I cherry-pick the last commit on branch 'current'?22:13
Vampire0 gabeodess, just break something and he will see :-D22:14
AlericInglewood, did you read the man-page already?22:14
DrNick AlericInglewood: out of curiosity, what part of the git cherry-pick manual confuses you?22:14
gabeodess Vampire0: yeah... I do all the time... it doesn't seem to be quite the motivation he needs.22:15
AlericInglewood Vampire0: I read it before I asked :p22:15
gabeodess he just gets mad... but still doesn't want to spend money22:15
Vampire0 gabeodess, break something you cannot fix afterwards *g*22:15
And that costs him lots of money22:15
but beware, that could be dangerous for you job :-)22:15
gabeodess true. haha22:15
AlericInglewood DrNick: It says "git-cherry-pick [--edit] [-n] [-x] <commit>", but if I type 'current' at the place of commit... that confuses me, because 'current' is a branch, and not the last commit only22:16
Vampire0 a branch is nothing else than a pointer to ONE commit22:16
that this pointer is called a branch is just convention22:16
sitaram traviscline: I was due to promote pu to master anyway; done22:16
Vampire0 your commits are not on a branch22:16
sitaram traviscline: so that RWD or RW+D (no more standalone "D") is now in master22:16
AlericInglewood Ok, so I can treat a "branch" as commit and I'll get just the last commit22:16
Vampire0 all your commits are in a gargantuous tree of commits22:17
and some labels are put on certain commits22:17
crab gargantuous.22:17
Vampire0 some of them are called tags, some branches22:17
← hebz0rl left22:17
Vampire0 As far as I understood it AlericInglewood, yes22:17
You can also just try22:18
AlericInglewood Yeah, I understood that a branch is a tag that moves along automatically when you commit on top of it.22:18
Vampire0 There is almost nothing in git that you cannot undo afterwards22:18
exactly AlericInglewood22:18
jast wonder95: sorry, missed that. for the record, you should have dropped the ".git" in the writable line, too.22:18
← psoo left22:18
AlericInglewood I thought that maybe I'd have to type current{1}..current :p22:19
wonder95 jast: yeah, I didn't have it there, either - thanks, though22:19
Vampire0 AlericInglewood, I guess you mean current@{1}..current?22:20
Which would not be correct22:20
← Arelius left22:20
AlericInglewood Vampire0: I forgot where I read about the '..' :/22:20
Vampire0 because if you e. g. did a git reset, the reflog (the thing you reference with the @{1} notation) doesn't hold the parent of current22:20
jast wonder95: anyway, gitosis doesn't like ssh:// URLs that much, you're better off using URLs like [email@hidden.address]22:21
Vampire0 the .. was correct22:21
jast (iirc)22:21
Vampire0 But you meant current^..current or current~..current22:21
or, if I remember correctly simply current^! which is a shorthand for that22:21
AlericInglewood %-)22:21
Vampire0 But still, that specifies a range22:21
and you just want one commit22:21
you should really do what I tell you22:22
→ Arelius joined22:22
AlericInglewood cherry-pick only CAN take a single commit no?22:22
Vampire0 Not always only on the second time22:22
In this case I mean reading man git-rev-parse22:22
Gitbot Vampire0: the git-rev-parse manpage can be found at http://git.or.cz/man/git-rev-parse22:22
jast AlericInglewood: yep, only one22:22
Vampire0 Which shows you all ways to specify revisions and ranges22:22
AlericInglewood I guess it would not accept a .. notation then22:22
jast it wouldn't make much sense, anyway22:22
wonder95 jast: no matter what I try with the git user, I get "ERROR:gitosis.serve.main:Repository read access denied", but everything is owned by the git user on the server22:23
Vampire0 I don't know AlericInglewood, maybe it would work with a range that only contains one commit, but as I said, this is not necessary at all22:23
jast wonder95: yeah, well, gitosis's "read access denied" message doesn't generally refer to filesystem permissions22:23
Vampire0 wonder95, may I suggest using gitolite? It supersedes the not longer maintained gitosis and has more features22:23
jast that too22:24
wonder95 yeah, I'm starting to think that's what I need to use22:24
jast oh well, I gotta go. I'm cutting my sleepytime dangerously short again22:24
Vampire0 That's a good start22:24
wonder95 thanks for the suggestions22:24
Vampire0 Now just do it :-)22:24
yw22:24
← infogulch left22:25
← gabeodess left22:25
← hagna left22:26
→ mike6 joined22:26
mike6 hi22:26
Rolenun howdy! :D22:26
→ strop joined22:27
← ph^ left22:27
Vampire0 yeehaw22:27
Rolenun hehe, even I know how to answer a hello :D22:27
my works done :D22:27
mike6 m, new to git and coming from svn, so i got some questins regarding branches22:28
can someone plz help me here?22:28
Vampire0 Hey, you can answer any question Rolenun, look at me22:28
Noone cares whether the answer is correct or not :-D22:28
Rolenun mike6: http://progit.org/book/22:28
:)22:28
all will be revealed :D22:28
mike6 yeah i know, but i was thiking i just a simple fast not-painly question22:29
Vampire0 mike6, if, after reading some documentation like what Rolenun suggested, or the man-pages, or the community book you still have questions22:29
or you already have read some, you should post some real questions22:29
Rolenun i never even saw your question Vampire0 :)22:29
Vampire0 asking to ask is not a good idea in IRC because usually noone will answer to such questions22:29
← ded` left22:30
Vampire0 Rolenun, I didn't post a question lately22:30
Rolenun for generic questions, I always point to that site :D22:30
lol, you said I can answer your question?22:30
Vampire0 no, i didn't22:30
at least I didn't want to say that22:30
Rolenun <Vampire0> Hey, you can answer any question Rolenun, look at me22:30
mike6 well havent read many documentation, just the svn crash course22:31
Rolenun aha! a generic statement lol22:31
← sgh left22:31
← Theravadan left22:31
Vampire0 mike6, as I said, just state your question. If it is too trivial, we will tell you to read the documentation. :-D22:31
Rolenun, exactly. and the line below that one you quoted was actually part of the sense22:32
I meant look at me how I answer questions22:32
Rolenun I just saw the Rolenun line :D22:32
Vampire0 [00:28:20] <Vampire0> Hey, you can answer any question Rolenun, look at me22:32
[00:28:30] <Vampire0> Noone cares whether the answer is correct or not :-D22:32
← johnw left22:32
mike6 m actually right reading git branching right now, but the question was... if i set the git-clone branch arg poiting to an a special branch, when i "pull" the repository updates, the copy will always point to that branch22:32
Vampire0 now got both ones?22:32
mike6 or i have always put what bracnh i want22:33
Vampire0 mike6, I'm sorry, but I cannot tell you whether the question is trivial, because unfortunately I didn't get what you wanted to say. That could be cause by me not being a native speaker though22:34
Rolenun he's asking if there is a way to set a default branch for pulling22:35
wonder95 Vampire0: if I have gitosis installed, do I need to delete anything first before installing gitloite?22:35
Vampire0 wonder95, I don't know, I used neither of both. I just know what I told you about those :-)22:35
Rolenun lol, that makes two of us. I use github if I really need a server based git system.22:36
mike6 me too Vampire0, m from mx22:36
Vampire0 Rolenun, there are people that don't want their code hosted on someone elses servers ;-)22:37
Rolenun exactly, which is why git is the best option.22:37
Vampire0 mike6, sorry?22:37
→ christophsturm joined22:38
→ Wraithan joined22:38
Vampire0 sure Rolenun but sometimes you need a central server which still should not be on someone elses servers22:38
think about a company :-)22:38
Rolenun git is a central server22:38
mike6 Rolenun understand very well my question, but well, m reading the git-pull manpage and seems to say that git-config is in charge what exactly of what m looking for22:38
Rolenun provides upload and download via command line22:38
→ coppro joined22:39
Rolenun great :)22:39
Vampire0 Rolenun, you know very well what I mean :-P22:39
→ ntoll joined22:40
icefox Vampire0: looking for something simple or something webbased like github/gitorious? Got a little web app I have been working on called GitHaven and am looking for some beta testers22:40
Rolenun not really....github for offsite storage if absolutely necessary, otherwise, ppl pulling from me IS my backup22:40
← Arelius left22:40
Rolenun oh right...no one pulls from you :D22:40
Vampire0 No icefox, I'm not, but thanks.22:41
← tar- left22:41
← Ryback_ left22:41
← cozmo left22:41
← aspotashev|eeepc left22:41
Vampire0 Rolenun, you should just accept that not everyone is using the real distributed approach22:42
→ neutrino joined22:42
neutrino → tar-22:42
Vampire0 imagine a company22:42
they still want and need their code at a central place22:42
→ Arelius joined22:42
ShooterMG Vampire0: nothing from stopping you from doing that with git, if that's what you're wondering22:43
i've got repos everywhere22:43
just put a repo on a server and put a sticky note on the case that says 'git server' lol22:43
Rolenun Vampire0, I'll never accept that. may as well use svn :D22:43
← mtkd left22:44
Vampire0 aaargh ShooterMG I don't have a question, thanks22:44
not currently22:44
just chatting with Rolenun about general usage patterns22:44
:-)22:44
ShooterMG wonderful :)22:44
crab wow, githaven is expensive.22:45
icefox crab: haha you havn't looked at GitHub:Fi have you22:45
Wraithan We use git at work, and use a central repo. But using git gives us all the benefits of having the whole history local, as well as gits awesome merging22:46
← tvw left22:46
→ shruggar joined22:46
crab what is github:fi?22:46
Wraithan plus I can pull from a co-worker directly should we be working on something together, instead of having to push it to the central repo before it is ready and the tests aren't passing yet22:46
← killerchicken_ left22:47
icefox crab: a local install of GitHub, $850/person + support22:47
→ gabeodess joined22:47
← ntoll left22:47
← mike6 left22:48
Wraithan why would someone ever use githaven over gitorious or similar?22:48
icefox Wraithan: ever try to install/maintain a gitorious box?22:48
→ ntoll joined22:48
icefox thats why I made GitHaven22:48
schacon hey icefox - how you been?22:48
icefox I need something simple that works22:49
crab icefox: oh. well, your demo site looks nice. (i saw it yesterday, you posted a link in an HN comment)22:49
← hakunin left22:49
← ntoll left22:49
schacon i guess you got home ok, huh?22:49
icefox schacon: hey there, been good22:49
→ hakunin joined22:49
Wraithan icefox: gitorious is easy to maintain... I've done it for 2 companies22:50
icefox between gitorious being hard to install and maintain and I don't really like the project base v.s. people based for repositories and GitHub:Fi being really expensive there might be a nitch. If not I always have it for myself22:50
← thiago_home left22:50
← agile left22:50
ShooterMG i think your pricing for githaven is really smart22:50
crab niche22:50
AlericInglewood Um, so ... git reset is just a way to move the branch "tag", correct?22:50
icefox niche :) And if there isn't one well i'll just bsd it and put it out there22:51
← lambda left22:51
Wraithan I think the pricing is outrageous for something that does little to nothing.22:51
crab aleric: that, and a little more. git reset --hard is a way to move the branch head.22:51
Wraithan *shrug*22:51
→ esc joined22:51
← giallu left22:52
AlericInglewood crab: *confused* ... I thought it always moved the HEAD, and the branch that the HEAD was pointing to... but moving the branch.22:52
s/but/by/22:52
schacon i think you're outrageous for something that does little to nothing22:52
← airborn left22:52
← adaro left22:52
AlericInglewood crab: Suppose I want to move a branch(tag) from whereever it is to a commit at SHA1, .. can I do that with git reset?22:53
→ gabeodess_ joined22:53
← esc left22:53
Vampire0 AlericInglewood, reset can move the branch head, it can also reset the index and/or the working tree if desired depending on --soft, --hard or none of both e. g.22:53
← TeckniX left22:54
Vampire0 to see what git reset all can do, read its man-page :-P22:54
crab aleric: HEAD is the branch head of the current branch22:54
RandalSchwartz a branch is a point, not a line22:54
AlericInglewood I read all man pages and a lot of other docs :/22:54
RandalSchwartz this is something that takes a while to sink in, perhaps22:55
crab aleric: but every branch has a branch head which points to the commit at the tip of the branch.22:55
aleric: so you can move a branch head with git reset --hard, yes22:55
AlericInglewood I could do what I have in mind with: git branch -d foobar; git checkout -b foobar SHA1; ... I think.22:55
← aheinecke left22:55
AlericInglewood Now I wonder if that can be done with a single git reset command.22:56
Vampire0 AlericInglewood, you should be able to do that with reset, as you thought, I think22:56
→ esc joined22:56
crab no, you can't unless you have that branch checked out.22:56
→ johnw joined22:56
← altogether left22:56
Vampire0 I suppose he has22:56
at least from his comments22:57
crab then he can't delete it22:57
Vampire0 I guess he didn't try those commands22:57
crab oh :)22:57
← gabeodess left22:57
gabeodess_ → gabeodess22:57
→ jmcantrell joined22:57
Vampire0 I know, I guess a lot22:57
But mostly I'm right :-)22:57
Rolenun ...22:57
← coppro left22:58
RandalSchwartz ahh, yeah, yesterday was crazy22:58
Oops ... please ignore that.22:58
← esc left22:58
Rolenun too late! :)22:58
RandalSchwartz heh22:59
AlericInglewood Right now I have: A (branch: current) -- B -- C (branch: master), and I want to move current to B... So I guess I can't do that with a reset.22:59
Vampire0 What was yesterday? :-)22:59
RandalSchwartz luckily nothing *too* secret22:59
mugwump Vampire0: just read his twitter22:59
crab aleric: git reset --hard B22:59
AlericInglewood crab: after checking out current, I guess :p23:00
hmm ok... so git reset always works on the currently checked out branch...23:00
→ onigiri_ joined23:00
→ adaro joined23:00
RandalSchwartz you can move ref/head/* manually too23:00
with plumbing commands23:00
← Arelius left23:01
RandalSchwartz git symbolic-ref23:01
→ esc joined23:01
→ ProperNoun joined23:01
← ProperNoun left23:01
→ ProperNoun joined23:01
← ProperNoun left23:01
RandalSchwartz git symbolic-ref refs/heads/BRANCHNAME B23:02
← tg left23:02
RandalSchwartz oh - but you might also need to expand B23:02
yeah - simpler to check it out :)23:02
→ Arelius joined23:02
→ tg joined23:02
Vampire0 "expand"?23:03
← ProperN[out] left23:03
Vampire0 You mean abbreviated SHA -> full SHA? Or what?23:03
mugwump full ref name23:04
← priidu left23:05
mugwump git symbolic-ref $(git rev-parse --symbolic-full-name $source) $(git rev-parse --symbolic-full-name $destination)23:06
→ Theravadan joined23:06
← marshall left23:06
→ ijuma joined23:06
Vampire0 shouldn't the second argument be a SHA mugwump?23:07
← meanburrito920 left23:08
← onigiri_ left23:08
mugwump not for symbolic-ref23:09
← hakunin left23:09
← zehrique left23:09
← IslandUsurper left23:10
← orafu left23:10
→ orafu joined23:10
→ IslandUsurper joined23:10
Vampire0 with second I mean $destination23:11
Doesn't a symbolic ref like refs/heads/master point to a SHA? *confused*23:11
→ meanburrito920 joined23:12
→ sh1m joined23:12
Vampire0 ah, no, I see23:12
HEAD is a symbolic ref which points to another ref23:12
← adaro left23:12
Vampire0 So wouldn't update-ref be what he wants then?23:13
git update-ref refs/heads/BRANCHNAME B23:13
← sh1mmer left23:14
sh1m → sh1mmer23:14
→ onigiri_ joined23:16
→ madewokherd joined23:18
→ gsan joined23:19
→ adaro joined23:19
→ juan_arandaalvar joined23:20
→ agile joined23:20
← Arelius left23:21
← Weasel[DK] left23:21
→ EricInBNE joined23:23
→ Arelius joined23:23
← stamina left23:25
→ stamina joined23:26
← adaro left23:27
← AAABeef left23:29
← eletuchy left23:32
→ hyperair joined23:34
vinse can i list tags in order of time created?23:35
← sh1mmer left23:37
johnjay how do I find out in which branch a ref/commit was pushed?23:37
→ tonyj joined23:37
Vampire0 vinse, does maybe "git show-ref --tags" help you? I'm sure there are also ways to show it more pretty23:41
→ tjoe joined23:41
Vampire0 johnjay, commits are in no branch23:41
→ tzafrir_laptop joined23:41
Vampire0 A branch is just a label for a specific commit23:41
What you call a branch is just the history of that single commit23:42
tjoe hi, I have a branch and I need to sign the last 10 commit, is there an easy way to do that ?23:42
← Arelius left23:42
vinse Vampire0: yeah, that's the same arbitrary order i get from git tag -l23:42
well, alphabetical, not arbitrary... i want git tag -lrt ;p23:42
Vampire0 But I guess you are searching for the --contains parameter of git branch johnjay23:42
johnjay Vampire0: sure, I understand that...but isn't there a way to get the branch name of the parent commit?23:43
Vampire0: tried --contains23:43
← tzafrir left23:43
→ sh1mmer joined23:43
johnjay Vampire0: ah success...was missing the -a ... git branch -a --contains 3cfd2ef97f0dc23d30c3c17c1593bb203539d828\23:43
(I hadn't rebased locally)23:44
→ nighthwk1 joined23:44
→ Arelius joined23:44
← mithro left23:44
eco I want to rename master on my origin to something else and make another branch master.23:45
← tonyj left23:46
eco When I try to remove master I get a long warning about how you can't delete the current branch.23:46
→ tonyj joined23:46
eco Which I understand means it's the branch pointed to by HEAD.23:46
← LiamH left23:46
eco How do I go about pointing the current branch elsewhere?23:46
wereHamster eco: how are you deleting the master branch?23:47
Vampire0 Hm, sorry vinse I don't know. But as almost anything is possible with git I guess somehow it will work23:47
eco git push origin :master23:47
→ imajes joined23:48
wereHamster eco: and what is the warnign?23:48
Vampire0 good johnjay :-)23:48
← webchick left23:48
← imajes left23:49
eco "error: By default, deleting the current branch is denied, because the next 'git clone' won't result in any files checked out, causing confusion."23:49
It's basically the issue discribed in the 1.6.3 release notes, looks like.23:50
I could configure receive.denyCurrentBranch on the remote repository to get away with this but I think it'd be better to just point current elsewhere (and eventually point it back at the new master I'm going to end up with).23:51
← IslandUsurper left23:52
wereHamster eco: you can push the master branch under a different name and then push -f to overwirte master23:52
eco The remote repository is bare so I'm a little confused about why there is a "current branch"23:52
wereHamster of course there is a current branch, it's whatever HEAD points to23:52
eco I think I need to read a little more about what HEAD is...23:53
Because I'm apparently confused.23:53
wereHamster HEAD is what you currently have checked out23:54
→ Arrowmaster joined23:54
eco Doesn't a bare repository not have anything checked out?23:54
→ xnox joined23:54
wereHamster it doesn't have a working tree, but that doesnt' mean there can't be a default branch23:55
DrNick it still has a HEAD pointing to what should be checked out on a fresh clone23:55
eco Ah, ok. Do you guys know how I can change what HEAD points to?23:55
The push -f would probably work but now I'm just curious.23:55
wereHamster for that you need shell access to the bare repository23:56
eco I've got it.23:56
symbolic-ref?23:57
← juan_arandaalvar left23:57
wereHamster HEAD usually is.. if that was your question23:57
ajpiano → ajjeana23:57
eco Is "git symbolic-ref refs/heads/<somebranch>" the proper way?23:58
xnox Hello all. I would like to push remote "origin" to a repository on gitorious such that it will become mirror of the "origin". How would I do that?23:58
eco Err, I'll just read this man page since I need to know this stuff anyway.23:58
Thanks, wereHamster .23:58
xnox I've set pushurl & push = +refs/remotes/origin/*:refs/heads/*23:58
← novas0x2a left23:58
xnox is that enough or no?23:58

Logs Search ←Prev date Next date→ Channels Documentation