22:41 -!- jlh [n=jlh@56.41.78.83.cust.bluewin.ch] has quit ["brb"] 22:43 -!- jlh [n=jlh@56.41.78.83.cust.bluewin.ch] has joined #git 22:44 -!- moh_ [n=mort@galileoii.bork.org] has joined #git 22:44 -!- moh [n=mort@galileoii.bork.org] has quit [Read error: 104 (Connection reset by peer)] 22:47 -!- jerbear [n=jerbear@216.54.203.74] has quit ["Hi, I'm a quit message virus. Please replace your old line with this line and help me take over the world of IRC."] 22:50 -!- solar_ant [n=solar@122.164.238.1] has quit [Read error: 104 (Connection reset by peer)] 22:50 -!- harning1 [n=harningt@149.164.193.61] has quit [Read error: 104 (Connection reset by peer)] 22:58 -!- Hidden [n=hidden@centaur.sch.bme.hu] has joined #git 23:02 -!- cods [n=cods@rsbac/developer/cods] has joined #git 23:02 -!- lcapitulino [i=lcapitul@nat/mandriva/x-fe0958889626d105] has quit ["Leaving"] 23:03 -!- rodserling [n=rod@pool-71-124-243-86.bstnma.east.verizon.net] has quit [Network is unreachable] 23:05 -!- sinequanon [n=davidjh@c-24-7-179-4.hsd1.ca.comcast.net] has joined #git 23:18 -!- up_the_irons is now known as irons|lunch 23:19 -!- strangy [n=ivica@78-3-91-4.adsl.net.t-com.hr] has quit ["Leaving"] 23:21 -!- vmiklos [n=vmiklos@frugalware/developer/vmiklos] has quit [Read error: 104 (Connection reset by peer)] 23:21 -!- vmiklos [n=vmiklos@frugalware/developer/vmiklos] has joined #git 23:22 -!- vmiklos [n=vmiklos@frugalware/developer/vmiklos] has quit [Read error: 104 (Connection reset by peer)] 23:26 -!- doublec [n=doublec@202.180.114.137] has joined #git 23:27 -!- vmiklos [n=vmiklos@frugalware/developer/vmiklos] has joined #git 23:29 -!- cmarcelo [n=cmarcelo@200.184.118.132] has joined #git 23:31 -!- wolf^ [i=wolf@pld-linux/wolf] has quit [Remote closed the connection] 23:32 -!- Oejet [i=proxyuse@cpe.atm2-0-1071147.0x3ef2a7ea.boanxx10.customer.tele.dk] has quit [Read error: 110 (Connection timed out)] 23:34 -!- wolf^ [i=wolf@pld-linux/wolf] has joined #git 23:36 -!- elmex_ [n=elmex@e180065086.adsl.alicedsl.de] has quit [Remote closed the connection] 23:39 -!- orospakr [n=orospakr@132.213.238.4] has quit ["Ex-Chat"] 23:39 -!- wolf^ [i=wolf@pld-linux/wolf] has quit [Remote closed the connection] 23:42 -!- wolf^ [i=wolf@team.pld-linux.org] has joined #git 23:44 -!- moh [n=mort@galileoii.bork.org] has joined #git 23:46 -!- moh_ [n=mort@galileoii.bork.org] has quit [Read error: 104 (Connection reset by peer)] 23:47 < workkevin> Can anyone tell me how git-svn determines what the current 'svn-remote' is? 23:47 -!- aroben [i=aroben@unaffiliated/aroben] has quit [Read error: 110 (Connection timed out)] 23:49 < MadCoder> I think it uses the first ancestor with a svn-id in it 23:49 < MadCoder> (which I find wrong, because it makes the whole purpose of doing the merges in git pointless) 23:49 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has quit ["Leaving."] 23:49 < MadCoder> but I'm not 100% sure either 23:50 -!- strangy [n=ivica@78-3-91-4.adsl.net.t-com.hr] has joined #git 23:51 -!- yorgen1555 [i=yorgen15@gateway/tor/x-9544f2022118ed96] has joined #git 23:52 -!- Eludias [n=eludias@wingding.demon.nl] has quit [Remote closed the connection] 23:53 < vmiklos> you can't merge in git-svn, just rebase 23:53 < context> git-svn stores info in .git/svn which im pretty sure keeps track of that stuff 23:53 < context> yeah dont merge with git-svn !! 23:53 < context> svn-fetch , rebase , dcommit 23:54 < MadCoder> I meant merge in a twisted sense indeed 23:54 < MadCoder> but even cherry pick from another svn branch breaks afaict with this way 23:55 -!- jwb is now known as jwb_gone 23:55 -!- ferdy [n=ferdy@gentoo/developer/ferdy] has quit ["leaving"] 23:55 < MadCoder> context: and well, it should not store that in .svn/ but in .git/config like it's done for remotes, tracking branches and stuff like that 23:56 -!- krh [i=krh@nat/redhat/x-0b0a88dfbb7e455a] has quit [Read error: 110 (Connection timed out)] 23:56 -!- aroben [i=aroben@unaffiliated/aroben] has joined #git 23:59 -!- rodserling [n=rod@pool-71-124-155-16.bstnma.east.verizon.net] has joined #git 00:01 -!- nessundorma [n=mike@80.104.56.16] has quit ["Leaving"] 00:06 -!- wolf^ [i=wolf@pld-linux/wolf] has quit [Remote closed the connection] 00:08 < workkevin> so, was wolf^ wolf's parent? 00:08 < workkevin> (first parent, specifically) 00:08 < Mikachu> no, he just represented an earlier state of wolf 00:11 -!- wolf^ [i=wolf@team.pld-linux.org] has joined #git 00:11 -!- Aeternus_ [n=Aeternus@cpc5-ptal1-0-0-cust7.swan.cable.ntl.com] has quit [Remote closed the connection] 00:11 -!- Aeternus [n=Aeternus@cpc5-ptal1-0-0-cust7.swan.cable.ntl.com] has joined #git 00:13 < gitster> If wolf^ is father and wolf^2 is mother, what's wolf^3? 00:14 < Mikachu> surrogate mother? 00:15 < LotR> gitster: bot wolf^2's father and wolf^'s mother? 00:15 < LotR> both 00:16 -!- Sonderblade [n=fsldfj@host-n81-168.homerun.telia.com] has joined #git 00:16 < Sonderblade> does git have a svn revert equivalent? 00:16 < bfields> more than 2 parents is an octopus merge, so at that point they are properly referred to as "legs", not parents. 00:18 < DrNick> Sonderblade: git checkout revision path 00:18 < DrNick> or just git checkout path 00:18 < Sonderblade> thanks 00:19 < DrNick> if you don't specify a revision, it will update from the index, not from HEAD 00:19 -!- GyrosGeier [n=richter@cl-1808.ham-01.de.sixxs.net] has joined #git 00:21 < Sonderblade> so exactly like svn revert no? 00:38 -!- p4tux [n=p4tux@189.169.95.23] has quit ["got root?"] 00:38 -!- p4tux [n=p4tux@189.169.95.23] has joined #git 00:43 -!- matteo [n=matteo@openwrt/developer/matteo] has joined #git 00:43 < matteo> hi all 00:43 < matteo> how can I get a branch? 00:43 < matteo> i have to clone the repo then switch 00:43 < matteo> or can I get the branch directly? 00:45 -!- spuk- [i=gustavod@unaffiliated/spuk] has quit ["rebut"] 00:46 < DrNick> you have to clone the repo 00:46 -!- cmarcelo [n=cmarcelo@200.184.118.132] has quit ["Leaving"] 00:52 -!- Pistahhh [n=szekeres@91.82.32.172.pool.invitel.hu] has joined #git 00:52 -!- Ryback_ [n=ulisses@200.184.118.132] has quit ["Leaving"] 00:55 < matteo> DrNick: and then? how to switch to mybranch? 00:55 < gitwump> you can clone one branch, using remote 00:55 < gitwump> eg: 00:56 -!- spuk- [i=gustavod@nat/mandriva/x-13d9656273bc4faa] has joined #git 00:56 < gitwump> mkdir clonedir; cd clonedir; git init; git remote -f -t remotebranch origin URL 00:56 < gitwump> someone really needs to add that feature to git-clone ;) 00:57 < gitwump> (it would have to actually call those commands, because git-clone is quite optimised for cloning everything) 00:57 < matteo> gitwump: i have already cloned the repo 00:57 < MadCoder> git checkout -b $foo origin/$foo 00:57 < matteo> i have just to switch 00:57 < gitwump> perhaps that is why it isn't implemented yet :) 00:57 < MadCoder> with $foo beint set to the branch you want to checkout and track 00:57 < MadCoder> actually --track -b $foo would be even better 00:57 < DrNick> git checkout --track -b somebranch origin/somebranch 00:58 < gitwump> --track is the default in newer git versions with checkout aiui 00:58 -!- GyrosGeier [n=richter@cl-1808.ham-01.de.sixxs.net] has quit [".zZ"] 00:59 -!- fowlduck [n=nate@24-183-45-79.dhcp.mdsn.wi.charter.com] has joined #git 01:01 -!- bdiego [n=bdiego@11-219-16-190.fibertel.com.ar] has quit ["Leaving"] 01:04 -!- p4tux [n=p4tux@189.169.95.23] has quit ["got root?"] 01:10 -!- Pistahh [n=szekeres@82-131-132-54.pool.invitel.hu] has quit [Read error: 110 (Connection timed out)] 01:10 -!- Pistahhh is now known as Pistahh 01:12 -!- Dodji [n=dodji@torimasen.com] has quit ["Parti"] 01:13 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has joined #git 01:15 -!- Ryback_ [n=ulisses@200.184.118.132] has joined #git 01:16 < robinr> anyone tried to make git-gui recognize the keyboard :) ? Actually I'm specifically thinking about scrolling down the file list using up/down keys 01:17 -!- Ryback_ [n=ulisses@200.184.118.132] has quit [Client Quit] 01:20 < matteo> last question 01:21 < matteo> how to quick revert to a tag? 01:21 -!- strangy [n=ivica@78-3-91-4.adsl.net.t-com.hr] has quit ["Leaving"] 01:21 -!- dash_ [n=dash@dslb-084-057-063-004.pools.arcor-ip.net] has joined #git 01:21 < matteo> git pull -t tag 01:22 < matteo> git pull -t tag origin/mybranch? 01:23 < Mikachu> do you want to change the tag or your working tree? 01:24 < gitster> Because he said "to a tag", I presume he does not want to move the tag, but I do not know what a 'quick revert' is. That is not in the tutorial nor glossary. 01:25 < Mikachu> he either wants git checkout -b mytag tag, or git reset --hard tag 01:25 < Mikachu> i think 01:25 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has quit ["Ex-Chat"] 01:25 < gitster> or "git checkout tag" to sightsee. We cannot tell. 01:33 -!- Pistahhh [n=szekeres@87.97.96.207.pool.invitel.hu] has joined #git 01:33 -!- dash__ [n=dash@dslb-084-057-047-200.pools.arcor-ip.net] has quit [Read error: 110 (Connection timed out)] 01:45 -!- REPLeffect [n=REPLeffe@dialup-4.244.45.12.Dial1.StLouis1.Level3.net] has joined #git 01:46 < robinr> git reset --hard tag to restore the branch to the specified tag (forgetting commits) 01:48 -!- jcollie [n=jcollie@dsl-ppp239.isunet.net] has joined #git 01:52 -!- Pistahh [n=szekeres@91.82.32.172.pool.invitel.hu] has quit [Read error: 110 (Connection timed out)] 01:52 -!- Pistahhh is now known as Pistahh 01:54 -!- michael__ [n=lingwitt@WITTEN.MIT.EDU] has joined #git 01:56 < michael__> Hello. (1) How come I get "perl: No match." when I push/pull with a remote server? Everything seems to work. (2) What is the best way to sync a cvs repo with a git repo? cvsexportcommit seems to do only one commit at a time. 02:01 < michael__> (1) Solved; this bastards had a bad login script. 02:01 < robinr> no, it commits all changes in one go 02:01 < michael__> That hasn't been my experience 02:01 < michael__> For instance, 02:01 < robinr> old version? 02:01 < michael__> maybe so 02:02 < michael__> Do you have un/stable? 02:02 < aeruder> git --version ? 02:02 < michael__> git version 1.5.3.2 02:02 < aeruder> that's pretty neww 02:02 < michael__> That's pretty recent, no? 02:02 < michael__> yeah 02:02 < aeruder> should be new enough anyway 02:02 < michael__> So I had like 60 git commits, 02:02 < robinr> yes, more than enough for cvexportcommt 02:02 < michael__> and the only way to get them in cvs was to do them one at a time, one after the other 02:03 < robinr> sry, I misread. 02:03 < robinr> I read "one file" 02:03 < robinr> you are right it takes on at a time 02:03 < michael__> indeed 02:04 < robinr> (set -e;for i in $(git rev-list HEAD~60..HEAD);do git-cvsexportcommit -c $i;done) 02:04 < robinr> but you may prefer a safer way 02:05 -!- jwb [n=jwboyer@fedora/jwb] has joined #git 02:05 < michael__> what's set -e? 02:05 < robinr> and do them one at a time. it only takes a few seconds per commit anyway 02:05 < robinr> that's stop on error 02:05 < michael__> Well, not when you have to login it doesn't! 02:05 < robinr> slow login? 02:05 < michael__> I thought it would stop on error anyway 02:05 < michael__> neat though 02:06 < michael__> VERY slow 02:06 < michael__> I would much rather just be able to patch everything quickly then 02:06 < robinr> you should look at why. you may have some DNS configuration problem. 02:06 < michael__> and then do one commit 02:07 < michael__> Well, I have to put in my password anyway for each; there's not a way for me to setup certificates. 02:07 < robinr> make a squash merge and send it to cvsexportcommit 02:08 < robinr> ssh-agent? 02:09 < michael__> neat 02:09 < michael__> I'll have to try that sometime 02:09 < robinr> I recall something about slow logins (in our case) having to do with non-working reverse DNS lookup 02:09 < aeruder> yea, reversedns can take a long time 02:09 < aeruder> (to fail) 02:10 < michael__> I'm afraid I can't see the virtue of a squash merge 02:10 < robinr> you wanted commit everything at once 02:10 < michael__> yes 02:10 < aeruder> man, squash merge throws so much away :-/ 02:10 < robinr> a squash merge would bolt all your 60 commits into one, which you'd send to cvs 02:11 < michael__> Well, it's either time with cvsexport or its information 02:11 < michael__> I'll throw out the info 02:11 < michael__> My life is ending soon 02:11 < robinr> ah, fix the dns 02:11 < robinr> you get annoyed with those slow logins after this too 02:11 < michael__> Well... Don't get me wrong. I'd still have the git history, but I need to update the cvs repo 02:11 < Mikachu> try starting nscd? 02:12 < robinr> not sure that helps 02:12 < michael__> Well, I'll look into the dns. But I can't imagine that's the reason. 02:12 < robinr> if reverse lookup isn't working the login will wait for the lookup to timeout 02:12 < michael__> I'm pretty sure I've got everything configured right 02:13 < robinr> ofcourse if you have a heavily loaded server that's a possibility 02:13 < michael__> So basically a squash merge just gets rid of the history, right? 02:13 < robinr> yes 02:13 < michael__> Why would you ever want to do that? 02:13 < michael__> I don't see how that gets me to cvs 02:14 < robinr> to get rid of the history 02:14 < michael__> I'd need to make a giant patch 02:14 < michael__> and apply it in the cvs repo 02:14 < robinr> that is *exactly* what the squash merge would do for you 02:14 < michael__> I see 02:14 < michael__> It would squash all the history into one commit 02:14 < robinr> you can drop it after that and keep your git history 02:16 < michael__> hee hee; my fatigue is showing. I still don't see it. 02:16 < michael__> I don't need to merge with a git branch 02:16 -!- moh [n=mort@galileoii.bork.org] has quit [Remote closed the connection] 02:16 < robinr> I'm assuming your 60 commits are in an uninterrupted commit chain 02:16 < michael__> yes 02:16 < robinr> create a temp branch from the parent of the first commit 02:17 < robinr> then git merge --squash lastcommitofthose60 02:17 < robinr> git-cvsexportcommit -u -c HEAD 02:17 -!- KirinDave [n=dfayram@208.76.47.86] has quit [Read error: 110 (Connection timed out)] 02:17 < michael__> I see now. I'm still getting used to the liberal use of branches in git 02:18 < michael__> It's a different way of thinking, and one that I like. But I'm still a novice for sure. 02:18 -!- cortila [n=sam@85-211-18-55.dyn.gotadsl.co.uk] has joined #git 02:18 -!- cortilap [n=sam@85-211-18-55.dyn.gotadsl.co.uk] has quit [Read error: 110 (Connection timed out)] 02:18 < robinr> git allows you to think differently 02:19 -!- Pistahhh [n=szekeres@91.82.34.170.pool.invitel.hu] has joined #git 02:20 -!- jwb_gone [n=jwboyer@fedora/jwb] has quit [Read error: 113 (No route to host)] 02:20 < robinr> is that "think different"? :) 02:20 -!- sadrul [n=sadrul@CPE000b6a5bd4b2-CM000a73a9223b.cpe.net.cable.rogers.com] has quit [Connection timed out] 02:22 < michael__> :) 02:26 * robinr thinks sleep 02:29 -!- csc` [n=csc@archlinux/user/csc] has quit [Remote closed the connection] 02:31 -!- csc` [n=csc@archlinux/user/csc] has joined #git 02:31 < michael__> I do to 02:31 < michael__> Have a good night 02:31 < michael__> and thanks 02:31 -!- michael__ [n=lingwitt@WITTEN.MIT.EDU] has quit [] 02:32 -!- jtoy__ [n=jtoy@c-65-96-150-204.hsd1.ma.comcast.net] has joined #git 02:35 -!- saintdev_ [n=saint@unaffiliated/saintdev] has quit [Read error: 104 (Connection reset by peer)] 02:37 -!- saintdev [n=saint@unaffiliated/saintdev] has joined #git 02:38 -!- Pistahh [n=szekeres@87.97.96.207.pool.invitel.hu] has quit [Read error: 110 (Connection timed out)] 02:38 -!- Pistahhh is now known as Pistahh 02:39 -!- bfields [n=bfields@mail.fieldses.org] has quit ["Leaving"] 02:49 -!- moh [n=mort@galileoii.bork.org] has joined #git 02:59 -!- rtmfd_icbm [n=ijbaird@dsl093-152-122.phx1.dsl.speakeasy.net] has quit [Read error: 110 (Connection timed out)] 03:03 -!- jerbear [n=jerbear@cpe-024-074-104-237.carolina.res.rr.com] has joined #git 03:05 -!- branstro1 [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has joined #git 03:05 -!- agoode [n=agoode@2001:4830:1633:0:212:3fff:fe70:6222] has joined #git 03:05 -!- bdiego [n=bdiego@190.50.193.227] has joined #git 03:09 -!- rtmfd_icbm [n=ijbaird@64.65.163.143] has joined #git 03:14 -!- rtmfd_icbm [n=ijbaird@64.65.163.143] has quit [] 03:14 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has quit [Read error: 110 (Connection timed out)] 03:16 -!- REPLeffect [n=REPLeffe@dialup-4.244.45.12.Dial1.StLouis1.Level3.net] has left #git ["bye"] 03:19 -!- toidinamai [n=frank@i59F720CD.versanet.de] has joined #git 03:19 < toidinamai> Hello. 03:20 < Tene> Hi! 03:20 < toidinamai> If cogito is "slowly being phased out" what is an alternative? Raw git? 03:21 < aeruder> toidinamai: yea, back many moons ago git was very low level 03:21 < aeruder> that is no longer the case 03:22 < toidinamai> Is there a "git for cogito users"? 03:29 -!- bdiego [n=bdiego@190.50.193.227] has quit ["Leaving"] 03:31 -!- twilight\ [n=ask@89.10.28.56] has joined #git 03:31 -!- fowlduck [n=nate@24-183-45-79.dhcp.mdsn.wi.charter.com] has quit [Connection timed out] 03:33 -!- FunkeeMonk [n=funkeemo@bb121-6-236-4.singnet.com.sg] has joined #git 03:42 -!- FunkeeMonk_ [n=funkeemo@bb121-7-111-238.singnet.com.sg] has joined #git 03:52 -!- matteo [n=matteo@openwrt/developer/matteo] has quit [Remote closed the connection] 03:54 -!- orospakr [n=orospakr@76-10-151-156.dsl.teksavvy.com] has joined #git 03:58 -!- aroben [i=aroben@unaffiliated/aroben] has quit [Read error: 104 (Connection reset by peer)] 03:59 -!- aroben [i=aroben@unaffiliated/aroben] has joined #git 03:59 -!- FunkeeMonk [n=funkeemo@bb121-6-236-4.singnet.com.sg] has quit [Read error: 110 (Connection timed out)] 04:00 -!- FunkeeMonk_ is now known as FunkeeMonk 04:04 -!- sgrimm [n=koreth@out156.sctm.tfbnw.net] has quit [Read error: 110 (Connection timed out)] 04:13 -!- fowlduck [n=nate@24-183-45-79.dhcp.mdsn.wi.charter.com] has joined #git 04:21 -!- bdiego [n=bdiego@190.50.193.227] has joined #git 04:21 -!- madewokherd [n=urk@cpe-71-67-180-205.neo.res.rr.com] has quit [Read error: 110 (Connection timed out)] 04:29 -!- branstro1 is now known as branstrom 04:44 -!- metafollic [n=metafoll@75.127.75.145] has quit [Read error: 104 (Connection reset by peer)] 04:47 -!- glguy [n=eric@unaffiliated/glguy] has joined #git 04:48 -!- REPLeffect [n=REPLeffe@dialup-4.244.45.12.Dial1.StLouis1.Level3.net] has joined #git 04:50 -!- FunkeeMonk [n=funkeemo@bb121-7-111-238.singnet.com.sg] has quit ["The Blue Pill"] 04:51 -!- metafollic [n=metafoll@75.127.75.145] has joined #git 04:52 -!- REPLeffect [n=REPLeffe@dialup-4.244.45.12.Dial1.StLouis1.Level3.net] has quit ["bye"] 04:52 -!- KirinDave [n=dfayram@c-67-160-204-118.hsd1.ca.comcast.net] has joined #git 04:55 -!- REPLeffect [n=REPLeffe@dialup-4.244.45.12.Dial1.StLouis1.Level3.net] has joined #git 04:59 -!- metafollic [n=metafoll@75.127.75.145] has quit [Remote closed the connection] 05:09 -!- metafollic [n=metafoll@75.127.75.145] has joined #git 05:09 -!- madewokherd [n=urk@cpe-71-67-160-42.neo.res.rr.com] has joined #git 05:10 -!- KirinDave [n=dfayram@c-67-160-204-118.hsd1.ca.comcast.net] has quit ["Leaving..."] 05:11 -!- orospakr [n=orospakr@76-10-151-156.dsl.teksavvy.com] has quit ["Ex-Chat"] 05:13 -!- saintdev [n=saint@unaffiliated/saintdev] has quit [Read error: 104 (Connection reset by peer)] 05:13 -!- saintdev [n=saint@unaffiliated/saintdev] has joined #git 05:13 -!- glguy [n=eric@unaffiliated/glguy] has quit [Read error: 104 (Connection reset by peer)] 05:15 -!- glguy [n=eric@unaffiliated/glguy] has joined #git 05:19 -!- jerbear [n=jerbear@cpe-024-074-104-237.carolina.res.rr.com] has quit ["Nice Scotty, now beam my clothes up too!"] 05:27 -!- metafollic [n=metafoll@75.127.75.145] has quit [Read error: 104 (Connection reset by peer)] 05:29 -!- fhobia [n=fhobia@c-24-6-54-200.hsd1.ca.comcast.net] has joined #git 05:29 -!- Muta [n=notme@24-178-71-72.dhcp.gwnt.ga.charter.com] has joined #git 05:30 -!- metafollic [n=metafoll@75.127.75.145] has joined #git 05:31 -!- dduncan [n=dduncan@S0106000f66d65e51.gv.shawcable.net] has quit [Read error: 104 (Connection reset by peer)] 05:35 -!- bdiego [n=bdiego@190.50.193.227] has quit ["Leaving"] 05:39 -!- saintdev [n=saint@unaffiliated/saintdev] has quit [Remote closed the connection] 05:41 -!- saintdev [n=saint@unaffiliated/saintdev] has joined #git 05:43 -!- jtoy__ [n=jtoy@c-65-96-150-204.hsd1.ma.comcast.net] has quit [] 05:43 -!- wolf^_ [i=wolf@team.pld-linux.org] has joined #git 05:44 -!- agoode [n=agoode@2001:4830:1633:0:212:3fff:fe70:6222] has quit [No route to host] 05:45 -!- wolf^ [i=wolf@pld-linux/wolf] has quit [Read error: 104 (Connection reset by peer)] 05:45 -!- rodserling [n=rod@pool-71-124-155-16.bstnma.east.verizon.net] has quit [Remote closed the connection] 05:45 -!- wolf^_ is now known as wolf^ 05:48 -!- adante [n=adante@124-171-135-5.dyn.iinet.net.au] has quit [Read error: 110 (Connection timed out)] 06:03 -!- orospakr [n=orospakr@bas4-ottawa23-1167863898.dsl.bell.ca] has joined #git 06:07 -!- Sho_ [i=ehs1@kde/hein] has quit [Read error: 113 (No route to host)] 06:07 -!- metafollic [n=metafoll@75.127.75.145] has quit [Read error: 104 (Connection reset by peer)] 06:10 -!- metafollic [n=metafoll@75.127.75.145] has joined #git 06:11 -!- aroben [i=aroben@unaffiliated/aroben] has quit ["Leaving"] 06:13 -!- wolf^_ [i=wolf@team.pld-linux.org] has joined #git 06:15 -!- wolf^ [i=wolf@team.pld-linux.org] has quit [Read error: 104 (Connection reset by peer)] 06:15 -!- wolf^_ is now known as wolf^ 06:21 -!- mgrimes [n=mark@cpe-76-88-47-191.san.res.rr.com] has joined #git 06:22 -!- mgrimes [n=mark@cpe-76-88-47-191.san.res.rr.com] has quit [Remote closed the connection] 06:23 -!- mgrimes [n=mark@cpe-76-88-47-191.san.res.rr.com] has joined #git 06:25 -!- jcollie [n=jcollie@dsl-ppp239.isunet.net] has quit [Remote closed the connection] 06:26 -!- rkaway2 [n=timj@e176222168.adsl.alicedsl.de] has quit [Read error: 110 (Connection timed out)] 06:29 -!- rkaway2 [n=timj@e176196178.adsl.alicedsl.de] has joined #git 06:34 -!- wolf^_ [i=wolf@team.pld-linux.org] has joined #git 06:34 -!- wolf^ [i=wolf@team.pld-linux.org] has quit [Read error: 104 (Connection reset by peer)] 06:35 -!- wolf^_ is now known as wolf^ 06:39 -!- fhobia [n=fhobia@c-24-6-54-200.hsd1.ca.comcast.net] has quit [Read error: 110 (Connection timed out)] 06:40 -!- Sonderblade [n=fsldfj@host-n81-168.homerun.telia.com] has quit [Read error: 110 (Connection timed out)] 06:44 -!- madewokherd [n=urk@cpe-71-67-160-42.neo.res.rr.com] has quit ["If your computer stops responding for a long time, turn it off and then back on."] 06:46 -!- mgrimes [n=mark@cpe-76-88-47-191.san.res.rr.com] has quit ["Leaving"] 06:47 -!- spearce [n=spearce@cpe-74-70-48-173.nycap.res.rr.com] has joined #git 06:48 -!- mgrimes [n=mark@cpe-76-88-47-191.san.res.rr.com] has joined #git 07:01 -!- aroben [n=aroben@unaffiliated/aroben] has joined #git 07:01 -!- doublec [n=doublec@202.180.114.137] has left #git [] 07:04 -!- rtmfd_icbm [n=ijbaird@dsl093-152-122.phx1.dsl.speakeasy.net] has joined #git 07:05 -!- rtmfd_icbm [n=ijbaird@dsl093-152-122.phx1.dsl.speakeasy.net] has quit [Client Quit] 07:10 -!- leonardop [n=leonardo@gentoo/developer/leonardop] has quit [] 07:19 -!- theCarpenter [n=Dragon45@bursley-220-128.reshall.umich.edu] has joined #git 07:23 < eMBee> good afternoon 07:24 < eMBee> how can i merge/cherry pick/ commits from a submodule into the main repo? 07:25 < gitwump> use git format-patch, and then git apply 07:25 < gitwump> but it sounds like an odd thing to want to do 07:26 < eMBee> well, my problem is that i have two repos for the same code 07:26 < eMBee> one is the upstream library, and another is our companies svn repo 07:26 < gitwump> right, well normally you manage that with branches in a single repo, not submodules 07:26 < eMBee> i pull updates from upstream and then need to copy them into the work svn repo 07:27 < spearce> gitwump now? hmmph. maybe i should switch to my "real" nick... ;-) 07:27 < gitwump> oh yeah maybe I should change that back 07:28 -!- dduncan [n=dduncan@S0106000f66d65e51.gv.shawcable.net] has joined #git 07:28 < eMBee> well, the library is in a subdirectory so i thought a submodule would be a good approach 07:28 -!- halfline [i=rstrode@nat/redhat/x-ddfcb377d16adcc5] has quit [Remote closed the connection] 07:28 -!- Teln1100A [i=hello123@bas2-toronto12-1168022952.dsl.bell.ca] has joined #git 07:30 < gitwump> ideally the *submodule* structure would resemble the upstream structure 07:31 < eMBee> well, i sort of have two upstreams 07:31 -!- Pistahh [n=szekeres@91.82.34.170.pool.invitel.hu] has quit [Read error: 104 (Connection reset by peer)] 07:31 < gitwump> doesn't matter 07:32 < eMBee> the problem really is that svn doesn't handle submodules 07:32 < gitwump> it has svn:externals which are a similar feature 07:32 < gitwump> apparently, never used them myself 07:34 * eMBee looks at that 07:35 < eMBee> hmm, indeed, that might help 07:36 < eMBee> i'd need to create another svn repo for it though, but that may not be a bad idea 07:39 < eMBee> i was kind of hoping that i could use submodules as if they were part of the main repo, have the branches show up in gitk and be able to copy changesets around so that local and remote repo do not need to be set up identically 07:40 -!- robinr [n=robin@h250n1fls32o811.telia.com] has quit ["close()"] 07:40 < gitwump> are both the upstreams svn? 07:40 < eMBee> no, only one 07:40 < gitwump> the svn one has the library as a sub-dir? 07:40 < eMBee> and technically i do have access to the svn server so i can make changes there 07:40 < eMBee> yes 07:41 < gitwump> extract the library on its own using git-svn 07:41 < gitwump> track the other one as another branch 07:41 < gitwump> then merge will work fine 07:41 < eMBee> that idea crossed my mind 07:42 < gitwump> who are you tracking an svn repo and getting submodules out of it anyway? 07:42 < eMBee> but how will the main checkout react? since that will checkout everything with the subdir included 07:42 < gitwump> s/who/how/ 07:42 < eMBee> i am not getting submodules out of svn so far 07:42 -!- Pistahh [n=szekeres@87.97.102.106.pool.invitel.hu] has joined #git 07:46 < eMBee> how does the submodule stuff work in general, if i pull from repo A, and then add a submodule in /lib/; while A itself does not have such a submodule. then someone else working on A puts stuff into lib, unaware that i have a submodule there. what will git do when i fetch from A again, pulling that new lib, conflicting with the one i have 07:48 -!- spearce_ [n=spearce@cpe-74-70-48-173.nycap.res.rr.com] has joined #git 07:48 -!- spearce [n=spearce@cpe-74-70-48-173.nycap.res.rr.com] has quit [Read error: 104 (Connection reset by peer)] 07:52 -!- rtmfd_icbm [n=ijbaird@dsl093-152-122.phx1.dsl.speakeasy.net] has joined #git 08:00 -!- hiarc [n=hiarc@62.141.49.57] has joined #git 08:03 -!- DrNick [i=fake@c-67-183-84-122.hsd1.wa.comcast.net] has quit ["."] 08:04 -!- engla [n=ulrik@wikipedia/Sverdrup] has quit [Read error: 110 (Connection timed out)] 08:07 -!- metafollic [n=metafoll@75.127.75.145] has quit [Remote closed the connection] 08:08 -!- engla [n=ulrik@193.212.97.9] has joined #git 08:13 -!- metafollic [n=metafoll@75.127.75.145] has joined #git 08:14 < cehteh> eMBee: when you found a convinient solution, tell me .. i still reject using submodules for svn synced stuff :) 08:22 -!- mwansa [n=ddr4@unaffiliated/mwansa] has joined #git 08:24 -!- sinequanon [n=davidjh@c-24-7-179-4.hsd1.ca.comcast.net] has quit ["Leaving."] 08:24 -!- Evelynn [n=Evelynn@193.95.254.78] has joined #git 08:41 -!- aroben [n=aroben@unaffiliated/aroben] has quit [Read error: 104 (Connection reset by peer)] 08:48 -!- aroben [n=adamrobe@c-67-160-250-192.hsd1.ca.comcast.net] has joined #git 08:52 -!- sgrimm [n=koreth@c-76-21-111-212.hsd1.ca.comcast.net] has joined #git 08:54 -!- spuk- [i=gustavod@unaffiliated/spuk] has quit [Read error: 110 (Connection timed out)] 09:12 -!- REPLeffect [n=REPLeffe@dialup-4.244.45.12.Dial1.StLouis1.Level3.net] has quit [Read error: 110 (Connection timed out)] 09:15 -!- kanru [n=kanru@2001:5c0:8fff:fffe:0:0:0:69ab] has quit ["Leaving"] 09:17 -!- spearce_ [n=spearce@cpe-74-70-48-173.nycap.res.rr.com] has quit [Read error: 110 (Connection timed out)] 09:18 -!- namenlos [n=richi_au@c703-fwngw.uibk.ac.at] has joined #git 09:22 -!- rtmfd_icbm [n=ijbaird@dsl093-152-122.phx1.dsl.speakeasy.net] has quit [] 09:41 -!- kanru [n=kanru@2001:e10:6840:19:212:f0ff:fe21:3332] has joined #git 09:55 -!- jaalto [i=jaalto@a81-197-175-198.elisa-laajakaista.fi] has quit [] 09:59 -!- aroben [n=adamrobe@unaffiliated/aroben] has quit [] 10:02 < tsuna> I have a branch A and a branch B, and I'd like to check whether branch A's head and branch B at a given commit have the same content in src/network only. 10:03 < tsuna> Is git diff 9cc58f38 HEAD -- src/network the right thing to do? Where 9cc58f38 is the commit in branch B and HEAD is because I'm currently on branch A. 10:04 < tsuna> I'm asking because I do see diffs but this is a git-svn repo and doing the same diff in SVN doesn't show any diff: svn diff -r https://host/svn/proj/{trunk,branches/2.0}/src/network 10:04 < tsuna> So maybe I'm misunderstanding what git diff showed me or maybe I'm not using svn correctly (but that's another story). 10:05 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has joined #git 10:07 < MadCoder> git diff A..B -- src/network 10:07 < MadCoder> tsuna: ^^ 10:08 < glguy> git diff A B -- src/network == git diff A..B -- src/network 10:08 < glguy> which is what he said he typed? 10:09 < tsuna> Indeed. 10:09 < MadCoder> git diff A..B is not the same as git diff A B 10:09 < MadCoder> is it ? 10:09 < tsuna> It is the same, look at a recent man git-diff. 10:09 < MadCoder> A..B is supposed to be ^A B ? 10:09 < tsuna> It's a common misunderstanding. 10:10 < glguy> MadCoder: I'm not testing it, just quoting the man page 10:10 < MadCoder> hmm I stand corrected 10:10 < tsuna> git diff is meant to diff two trees, and the fact that people are used to the notation A..B for other commands (to express a range of commit) leads them to think that they have to use A..B for git diff which silently accepts it as A B. 10:10 < MadCoder> those X..Y inconsistencies drives me crazy :) 10:10 < tsuna> AFAIK it's the only inconsistency when it comes to A..B. 10:11 < MadCoder> though it's an inconsistency that makes sense, and I now remember that this was indeed discussed recently 10:11 < glguy> what is the inconsistency? 10:11 < glguy> A..B means everything after A upto and including B, right? 10:11 < MadCoder> A..B means ^B A everywhere else 10:11 < tsuna> Yes but not for git-diff. 10:12 -!- mwansa [n=ddr4@unaffiliated/mwansa] has left #git ["blah blah"] 10:12 < MadCoder> glguy: it does not means "after" 10:12 < MadCoder> A..B means every commit that is an ancestor of B but not of A 10:13 < glguy> right 10:13 < glguy> which is different in the case of a fork? 10:13 < MadCoder> and A..B is ^A B not ^B A 10:13 < glguy> from the other form? 10:13 < MadCoder> A B means every ancestor of A _and_ every ancestor of B 10:13 < gitster> diff is special. 10:14 < gitster> diff is about two points, never about ranges. 10:14 < MadCoder> gitster: yeah when you think about it it's obvious 10:14 < gitster> so A..B == ^A B does not apply. 10:14 < MadCoder> I was just confused because of lack of caffeine 10:14 < glguy> it just grabs the two trees 10:14 < glguy> and shows the differences? 10:14 < MadCoder> yes 10:14 < glguy> is what makes it special? 10:14 < gitster> It is just to save older people (read: Linus) from common typos, as they are so used to the range notation used in logs. 10:15 < MadCoder> haha 10:17 < gitster> I am not joking. Look for an article by Linus in the list archive. He responds to a complaint "why do you have both diff A..B and diff A B" with "you do not have to use A..B if you do not like it". 10:17 < MadCoder> it nontheless makes me laugh 10:19 < gitster> In the hindsight, we probably should have used A...B form for two point diffs, but it is too late now. Three-dot range is much later invention. 10:22 -!- Pistahh [n=szekeres@87.97.102.106.pool.invitel.hu] has quit [Read error: 104 (Connection reset by peer)] 10:24 -!- marcel [n=marcel@wc-50.r-195-35-150.atwork.nl] has joined #git 10:24 -!- Pistahh [n=szekeres@82-131-132-81.pool.invitel.hu] has joined #git 10:25 -!- dkagedal [n=david@dns.vtab.com] has quit ["Leaving."] 10:27 -!- dkagedal [n=david@dns.vtab.com] has joined #git 10:29 -!- Dodji [n=dodji@torimasen.com] has joined #git 10:35 -!- elmex [n=elmex@e180065018.adsl.alicedsl.de] has joined #git 10:39 < tsuna> Say I have a repo in which a library was developed. Now I have other repos, with other projects that wish to use this library. Thus, I'd like to take that lib out of its current repo and put it in its own one so that other projects can have it as a submodule. 10:40 < tsuna> Is it possible to easily extract the history of the subdir of that lib to replay it in a new repo? 10:40 -!- namenlos [n=richi_au@c703-fwngw.uibk.ac.at] has quit ["leaving"] 10:40 < MadCoder> in theory git-filter-branch knows to do that 10:40 < tsuna> I mean, I can easily script this and diff each rev with the following, going from the 1st to HEAD, and doing the diff only for the subtree where the lib is. 10:40 < MadCoder> though when I tried it last time, it gave me a ridiculously small history 10:40 < MadCoder> and I've not been able to track the issue yet 10:41 < tsuna> But how can I preserve the various other stuff such as timestamps, authorship, etc? 10:41 < MadCoder> i just said it 10:41 * tsuna is RTFMing 10:41 < tsuna> thanks for the pointer. 10:44 -!- ageo___ [n=ageo@p57B4AC4F.dip0.t-ipconnect.de] has joined #git 10:45 < MadCoder> hmm --subdirectory-filter (which is what you want) does not work here 10:45 < gitwump> yeah, git filter-branch with the tree filter, but you'll also need a parent filter that obliterates commits that didn't touch the path you wanted 10:45 < MadCoder> ohh so that's why I have a very short history then 10:45 < MadCoder> because it breaks at the first point where the commit did nothing in that path 10:46 < MadCoder> it's a shame --subdirectory-filter does not this on its own 10:46 < gitwump> well, that may be a bug. first I've seen that option 10:47 < gitwump> you've also got the question about what do you do if the path is moved around 10:49 -!- ageo___ [n=ageo@p57B4AC4F.dip0.t-ipconnect.de] has left #git ["Verlassend"] 10:49 -!- Yuuhi [n=user@p5483CC97.dip.t-dialin.net] has joined #git 10:55 -!- sgrimm [n=koreth@c-76-21-111-212.hsd1.ca.comcast.net] has quit [] 10:59 -!- yorgen1555 [i=yorgen15@gateway/tor/x-9544f2022118ed96] has quit [Remote closed the connection] 11:05 -!- kanru [n=kanru@2001:e10:6840:19:212:f0ff:fe21:3332] has quit ["Leaving"] 11:09 -!- robfitz_ [n=robfitz@213-202-173-130.bas504.dsl.esat.net] has joined #git 11:11 -!- robfitz [n=robfitz@A-71-23.cust.iol.ie] has quit [Read error: 145 (Connection timed out)] 11:19 < Catfish> I have a file in my working copy that I've modified, and would like to revert some of the changes back to how they were at the last checkin. Is there an easy way of pulling up a merge tool for that? 11:21 < MadCoder> a merge tool huh ? 11:22 < MadCoder> you can probably do: vimdiff path/to/your/file <(git show :path/to/your/file) 11:23 < MadCoder> (you can adapt it to the $tool of your choice of course) 11:27 < Catfish> Bah, I can't persuade opendiff to work from stdin. Guess I'll have to figure out how vimdiff works... 11:28 < Mikachu> git-mergetool -t vimdiff ? 11:33 -!- yorgen1555 [i=yorgen15@gateway/tor/x-dfa1b37066132064] has joined #git 11:33 -!- glguy [n=eric@unaffiliated/glguy] has quit ["leaving"] 11:33 -!- toidinamai [n=frank@i59F720CD.versanet.de] has quit ["Leaving"] 11:34 -!- felipec [n=felipec@a88-112-1-231.elisa-laajakaista.fi] has joined #git 11:35 < felipec> is it possible to clone specific directories with git-svn? 11:36 < felipec> I'm trying https://omxil.svn.sourceforge.net/svnroot/omxil/libomxil/trunk 11:36 < felipec> but it only works when I remove libomxil/trunk 11:38 < MadCoder> Catfish: yes you can using what I just said 11:38 < MadCoder> <(foo) is to be used as a file name 11:39 < MadCoder> works in bash and zsh at least 11:39 < gitwump> felipec: nopaste your errors? 11:42 < Catfish> MadCoder: Hmm, I can't persuade that to work in anything except vi 11:42 < Catfish> emacs, textmate, and opendiff all seem to be unable to read from <(foo) 11:42 < irons|lunch> i like how if you get conflicts during a rebase and want to abandon the whole idea, u can do "git rebase --abort". Does 'git merge' have something similar? I've seen lots of ppl screw up their merges and wish they could just start over 11:42 -!- irons|lunch is now known as up_the_irons 11:43 < felipec> gitwump: for some reason it doesn't seem to be working anymore 11:43 < felipec> but I got errors like these: 11:43 < felipec> http://www.spinics.net/lists/git/msg42422.html 11:43 < MadCoder> Catfish: then they suck 11:44 < MadCoder> use an intermediate temp file then 11:44 < Tv> felipe: try git-svn clone --trunk trunk --branches branches --tags tags https://omxil.svn.sourceforge.net/svnroot/omxil/libomxil/ 11:45 < felipec> felipec: but I don't want all that stuff, just the trunk 11:45 < Tv> felipe: try leaving out --branches and --tags, then 11:47 < up_the_irons> Tv: Tv ! 11:48 < Tv> hehe 11:48 < up_the_irons> Tv: I'm writing this up: http://cheat.errtheblog.com/s/git 11:48 < felipec> Tv: I got a libomxil directory with a bunch of .git stuff but nothing more 11:48 < gitwump> I am cloning that url now and it's working 11:48 < Tv> up_the_irons: how's that different from the n+1 existing ones?-) 11:48 < gitwump> felipec: does git-fsck say anything about dangling commits? 11:49 < Mikachu> up_the_irons: maybe you want git-reset --hard? 11:49 < felipec> gitwump: notice: HEAD points to an unborn branch (master) 11:49 < gitwump> anything in .git/objects ? 11:49 < Tv> felipe: try git checkout -b master trunk 11:49 < gitwump> ie, files 11:49 < up_the_irons> Tv: not much, but rails kids like the 'cheat' gem (so they can just type "cheat git" in the terminal); I've been pushing hard to get Git into the rails community. It's working 11:50 < Tv> up_the_irons: ror is nih-land.. 11:50 < gitwump> did you get much output like r64 = 2e1714fcdc6348d8f6aadf5c972ce32ffa886a57 ... ? 11:50 < up_the_irons> Mikachu: yeah, was thinkin about the git-reset too.. 11:50 < felipec> Tv: git checkout -b master trunk 11:50 < felipec> git checkout: updating paths is incompatible with switching branches/forcing 11:50 < felipec> Did you intend to checkout 'trunk' which can not be resolved as commit? 11:50 < Tv> felipec: "git branch -a"? 11:51 < felipec> Tv: main_0_2_devel@122 11:51 < felipec> main_0_2_devel@65 11:51 < Tv> that looks weird 11:51 < gitwump> normal 11:51 < felipec> gitwump: yes, lots of stuff 11:51 < up_the_irons> I'm temped to add a "git-unfuck" command; tired of ppl messing up their merges and not knowing how to start over 11:52 < gitwump> felipec: ok, so running git lost-found should give you some refs, one of which is hopefully your trunk 11:52 < gitwump> I think this problem is fixed on next or possibly even maint 11:53 < felipec> gitwump: git lost-found 11:53 < felipec> notice: HEAD points to an unborn branch (master) 11:53 < gitwump> yes, it looks like git-svn did not finish 11:53 < gitwump> you can fix that just by pointing master at any commit 11:54 < gitwump> one of the dangling ones, for instance 11:54 < Catfish> MadCoder: Ah. Just fwiw, opendiff foo =(git show :foo) works nicely 11:54 < Catfish> (I think the difference is temporary files vs named pipes?) 11:55 < Mikachu> file =(echo test) <(echo test) 11:55 < felipec> gitwump: how do I do that? :> 11:55 < gitwump> git update-ref refs/heads/master commitid 11:55 < Catfish> Bash doesn't seem to like =(foo) - does it have an equivalent? 11:56 < MadCoder> Catfish: maybe 11:56 < Catfish> (I use zsh, so this is just for curiosity's sake...) 11:56 < Mikachu> i saw a crazy page just 5 minutes ago, hang on 11:56 < MadCoder> yeah seems so, : 11:56 < MadCoder> echo =(git show) <(git show) 11:56 < MadCoder> /tmp/zsheuM0Yb /proc/self/fd/11 11:56 < Mikachu> http://home.eol.ca/~parkw/index.html , don't know if it's somewhere in there :) 11:57 < MadCoder> I didn't knew about =(..) I shall say :) 11:58 < felipec> gitwump: how do I find one of those commits? 11:59 < gitwump> find .git/svn -name \*rev\* -exec tail -1 {} \; 11:59 < gitwump> is one place there should be some 12:00 < gitwump> I just cloned that trunk successfully with git-svn 1.5.3.2 12:00 < gitwump> if I were you I'd consider upgrading 12:02 < felipec> gitwump: I think I'll do that... your instructions worked, but I think some commits are missing 12:07 < felipec> gitwump: git-svn --version 12:07 < felipec> git-svn version 1.5.3.2 (svn 1.4.3) 12:07 < gitwump> :-/ 12:08 < gitwump> well the only difference for me is I'm running a newer svn 12:08 < felipec> gitwump: I updated and still doesn't work 12:08 < gitwump> oh, I also didn't use clone 12:08 < felipec> I did: git-svn clone --trunk trunk --branches branches --tags tags https://omxil.svn.sourceforge.net/svnroot/omxil/libomxil/ 12:09 < gitwump> I did this: mkdir omxil; cd omxil; git init; git svn init https://omxil.svn.sourceforge.net/svnroot/omxil/libomxil/trunk; git svn fetch 12:09 < Mikachu> i think -s is a shorthand for that 12:13 < Mikachu> hm, it refetches the same commits when following the parents of another branch 12:13 < Mikachu> seems sort of pointless 12:13 < Mikachu> since it'll just be the same set of files 12:13 < felipec> gitwump: that worked 12:13 < Mikachu> ie, it fetches the exact same svn rXXX again 12:14 < gitwump> dealing with svn repos via the svn api is a black art at best 12:14 < Mikachu> well, git-svn has git-svn find-rev, it could see if we already have the tree object for that commit 12:15 < Mikachu> (maybe) :) 12:16 -!- meandtheshell [n=markus@85.127.105.233] has joined #git 12:16 -!- bentob0x [n=laurent@ip-213-49-73-152.dsl.scarlet.be] has joined #git 12:18 < felipec> gitwump: git svn init https://omxil.svn.sourceforge.net/svnroot/omxil/libomxil --trunk trunk --branches branches --tags tags 12:18 < felipec> that doesn't work 12:20 < gitwump> I've just set that going too 12:21 < gitwump> it seems to be happening quite happily 12:22 < felipec> gitwump: yeah, but at the end I have an unusable repo 12:22 < Mikachu> what happens at the end exactly? 12:23 < felipec> Mikachu: there are no files, there are no branches 12:23 < Mikachu> i mean what does git-svn say? 12:24 < felipec> Mikachu: nothing, it just finishes cleanly AFAIK 12:27 -!- Pistahhh [n=szekeres@91.82.39.106.pool.invitel.hu] has joined #git 12:33 < gitwump> the last line I see printed after the fetch is 'r311 = 67c42bbb071c084d542eacce7b67ef6a5ad31bd6 (trunk) 12:33 < gitwump> and then I get left with a 'master' which is trunk 12:34 < gitwump> you can have this clone if you promise to try to find out why mine worked and yours didn't :) 12:37 -!- dduncan [n=dduncan@S0106000f66d65e51.gv.shawcable.net] has left #git [] 12:44 -!- Pistahh [n=szekeres@82-131-132-81.pool.invitel.hu] has quit [Read error: 110 (Connection timed out)] 12:44 -!- Pistahhh is now known as Pistahh 12:50 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has quit [Read error: 110 (Connection timed out)] 12:50 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has joined #git 12:55 -!- namenlos [n=richi_au@c703-fwngw.uibk.ac.at] has joined #git 12:57 -!- kanru [n=kanru@2001:e10:6840:19:212:f0ff:fe21:3332] has joined #git 12:59 < felipec> gitwump: hehehe 12:59 < felipec> gitwump: you used "--trunk trunk --branches branches --tags tags" ? 13:00 < gitwump> yep 13:00 -!- mneisen [n=mneisen@pD9E53A58.dip.t-dialin.net] has joined #git 13:00 < felipec> gitwump: the only thing I need to use the new git is to change my PATH, right? 13:01 < gitwump> erm 13:01 < gitwump> well, check with git --version which one you're getting 13:03 < felipec> git version 1.5.3.2 13:04 < Arjen> I did a little experiment last night and was a little surprised: from 2 files I moved identical functions to a new file. (from Foo.pm and Bar.pm to Foobar.pm) The 'git blame' command showed that the section came from Foo.pm, but the 'git log -p' showed a diff against Bar.pm. The result is of course the same, but I was surprised at the inconsistency. Any thoughts? 13:05 < felipec> gitwump: so: git init, git svn init url --trunk trunk , git svn fetch 13:05 < gitwump> right 13:06 < gitwump> and eventually you get something like git://utsl.gen.nz/omxil 13:11 < felipec> all right, this time I ran a shell script and saved all the output 13:12 < felipec> gitwump: I'm behind a firewall, I can't access through the git protocol 13:13 -!- mithro [n=tim@ppp246-117.static.internode.on.net] has joined #git 13:13 -!- ferdy [n=ferdy@170.Red-213-96-222.staticIP.rima-tde.net] has joined #git 13:14 < mithro> shawn__: are you the infamous Shawn Pearce? :) 13:14 < gitwump> felipec: ok, funny url, but you can clone http://vserver.utsl.gen.nz/git/omxil/ 13:16 < felipec> gitwump: all right, no, I get nothing like that 13:17 < felipec> gitwump: which version of svn are you using? 13:17 < gitwump> mirror it with wget -r -np 13:17 < gitwump> svn trunk from about 15 Sep 13:17 < Mikachu> mithro: i think he goes by spearce 13:17 < mithro> ahh 13:17 -!- pigeon [n=pigeon@218-214-60-232.people.net.au] has quit [Client Quit] 13:18 < gitwump> if you mirror it you get to see what is different and hopefully see where your version starts to differ 13:34 -!- pigeon [n=pigeon@218-214-60-232.people.net.au] has joined #git 13:43 < felipec> gitwump: it's totally different 13:44 < felipec> gitwump: I have a bunch of .git/svn stuff, you don't have any 13:44 < felipec> hmm, maybe the mirror is not right 13:47 -!- Evelynn [n=Evelynn@193.95.254.78] has quit ["leaving"] 13:49 < felipec> gitwump: http://rafb.net/p/fliRmd70.html 14:05 -!- Sho_ [i=ehs1@kde/hein] has joined #git 14:19 -!- robfitz_ [n=robfitz@213-202-173-130.bas504.dsl.esat.net] has quit ["leaving"] 14:22 -!- agoode [n=agoode@2001:4830:1633:0:212:3fff:fe70:6222] has joined #git 14:23 -!- lcapitulino [i=lcapitul@nat/mandriva/x-0f9d5d89a8f8da5e] has joined #git 14:24 < Catfish> I applied half a patch, and committed the partially patched file. Now when I try and apply the patch again to try and get the remainder of the patch, it says patch does not apply. Is there any way of persuading it to do so, without manually editing the patch to remove the bits I've already applied? 14:30 -!- robfitz [n=robfitz@78.16.29.85] has joined #git 14:30 < felipec> how do I get git-svn to use another svn version? 14:30 < felipec> I have it in /opt 14:30 < bentob0x> anybody bought an openmoko here? 14:32 < Catfish> felipec: I don't know, but I'd imagine it uses your PATH variable. So if /opt/local/bin has priority, it'll use that 14:35 -!- cmarcelo [n=cmarcelo@200.184.118.132] has joined #git 14:35 < felipec> Catfish: it seems it's not 14:36 < Catfish> Hm. What does 'type svn' show? 14:37 < aeruder> i'd imagine git-svn uses the svn perl bindings 14:38 -!- jaalto [i=jaalto@a81-197-175-198.elisa-laajakaista.fi] has joined #git 14:39 < felipec> yeah, I think it uses the perl bindings 14:39 -!- fowlduck [n=nate@24-183-45-79.dhcp.mdsn.wi.charter.com] has quit ["Leaving"] 14:40 < eMBee> yes, it does use the perl bindings 14:40 < tsuna> felipec: I think (unsure) that you can try to export GITPERLLIB so that it points to the site_perl directory under /opt (most probably /opt/local/lib/perl5/site_perl/5.8.8 or something like that) 14:47 < felipec> tsuna: that's for the git stuff isn't it? 14:48 < tsuna> Yes, it's a wild guess after having a quick look at git-svn 14:48 -!- marcel [n=marcel@wc-50.r-195-35-150.atwork.nl] has quit [Remote closed the connection] 14:50 < felipec> tsuna: it might work once I fix one thing 14:50 -!- marcel [n=marcel@wc-50.r-195-35-150.atwork.nl] has joined #git 14:54 < felipec> all right 14:54 < felipec> export GITPERLLIB=/opt/svn/lib/perl5/site_perl/5.8.8:/opt/git/lib/perl5/site_perl/5.8.8 14:54 < felipec> export LD_LIBRARY_PATH=/opt/svn/lib 14:54 < felipec> that did the trick 14:55 -!- mneisen [n=mneisen@pD9E53A58.dip.t-dialin.net] has quit [Read error: 113 (No route to host)] 14:58 -!- Pistahhh [n=szekeres@82-131-134-70.pool.invitel.hu] has joined #git 15:00 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has quit [Read error: 110 (Connection timed out)] 15:00 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has joined #git 15:06 < felipec> gitwump: I tried with svn 1.4.5 and I still have the same issue 15:07 < tsuna> Grrr I hate SVN. Merging is so much uber-b0rken. 15:11 -!- Pistahh [n=szekeres@91.82.39.106.pool.invitel.hu] has quit [Read error: 110 (Connection timed out)] 15:11 -!- Pistahhh is now known as Pistahh 15:11 -!- jlh [n=jlh@56.41.78.83.cust.bluewin.ch] has quit [Nick collision from services.] 15:11 -!- jlh [n=jlh@227.49.79.83.cust.bluewin.ch] has joined #git 15:15 -!- moh [n=mort@galileoii.bork.org] has quit [Remote closed the connection] 15:17 -!- madewokherd [n=urk@cpe-71-67-160-42.neo.res.rr.com] has joined #git 15:19 -!- bdiego [n=bdiego@11-219-16-190.fibertel.com.ar] has joined #git 15:20 -!- moh [i=mort@galileoii.bork.org] has joined #git 15:25 -!- spuk- [i=gustavod@nat/mandriva/x-9737ba30fad88124] has joined #git 15:25 -!- agoode [n=agoode@2001:4830:1633:0:212:3fff:fe70:6222] has quit [No route to host] 15:28 -!- halfline [i=rstrode@nat/redhat/x-341adbb02adeacdf] has joined #git 15:28 -!- halfline [i=rstrode@nat/redhat/x-341adbb02adeacdf] has quit [Remote closed the connection] 15:28 -!- halfline [i=rstrode@nat/redhat/x-bbc53e8730b44d1d] has joined #git 15:32 -!- Ingmar [n=ingmar@83.101.12.148] has quit [Read error: 54 (Connection reset by peer)] 15:33 -!- Ingmar [n=ingmar@83.101.12.148] has joined #git 15:38 < thiago> how do I do a diff on a single file between two revisions, if the file has been renamed in-between? 15:39 < thiago> interesting, add -- 15:39 < tsuna> ? how? 15:39 < thiago> ah, no 15:39 < thiago> it's the wildcard 15:42 -!- engla [n=ulrik@wikipedia/Sverdrup] has quit [Read error: 110 (Connection timed out)] 15:46 -!- Ryback_ [n=ulisses@200.184.118.132] has joined #git 15:47 -!- halfline [i=rstrode@nat/redhat/x-bbc53e8730b44d1d] has quit [Remote closed the connection] 15:47 -!- halfline [i=rstrode@nat/redhat/x-edbb93ee35438331] has joined #git 15:50 -!- GyrosGeier [n=richter@cl-1808.ham-01.de.sixxs.net] has joined #git 15:53 -!- jackbravo [n=jackbrav@189.169.97.23] has joined #git 15:54 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has quit ["Leaving."] 15:55 < felipec> gitwump: I tried with latest svn, still the same result :'( 15:56 -!- orospakr [n=orospakr@bas4-ottawa23-1167863898.dsl.bell.ca] has quit ["Ex-Chat"] 16:15 -!- Oejet [n=s022018@bohr.gbar.dtu.dk] has joined #git 16:15 -!- FunkeeMonk [n=funkeemo@cm34.delta221.maxonline.com.sg] has joined #git 16:19 < madduck> MadCoder: I tried to follow your instructions for the vim git-commit plugin but if i put the autocmd into .vim/filetype.vim, the result is still ft=conf... 16:21 < MadCoder> madduck: my conf is online and works for me 16:21 < MadCoder> http://madism.org/~madcoder/dotfiles/vim/ 16:22 < MadCoder> note that the "plugin" does not what it should for merge commit, or --amend ones though 16:22 < MadCoder> (or maybe even for ones with some bits in the index and some not) 16:22 < MadCoder> and it has other shortcomings as well. 16:22 < MadCoder> I should work on it, but I'm too lazy 16:22 < MadCoder> patches welcomed 16:26 < madduck> k 16:26 -!- Pistahhh [n=szekeres@87.97.109.171.pool.invitel.hu] has joined #git 16:26 < madduck> would you mind if we changed the filetype from git to git-commit? 16:27 < madduck> MadCoder: btw: 16:27 < MadCoder> I absolutely don't care 16:28 < MadCoder> (meaning no I don't mind) 16:28 < madduck> au! BufRead,BufNewFile .msg.[0-9]* 16:28 < madduck> \ if getline(1) =~ '^From .\+ignored\.$' | setf mail | endif 16:28 < madduck> for git-send-email 16:28 < madduck> i am going to try to get this stuff into vim-runtime 16:28 < MadCoder> it's in vim-scripts btw 16:28 < MadCoder> (I think) 16:29 -!- reinhold [i=reinhold@kde/kainhofe] has joined #git 16:29 < madduck> yeah, i mean that. 16:29 < madduck> but the filetype detection can go to vim-runtime, really. 16:30 < MadCoder> in fact I think it's already here 16:30 < madduck> i don't think so. 16:30 < MadCoder> indeed 16:30 < madduck> but i'll check that of course 16:30 < MadCoder> it's not here 16:30 < MadCoder> I just hceked 16:30 < MadCoder> checked 16:36 -!- sgrimm [n=koreth@c-76-21-111-212.hsd1.ca.comcast.net] has joined #git 16:38 -!- kanru [n=kanru@2001:e10:6840:19:212:f0ff:fe21:3332] has quit ["Leaving"] 16:40 -!- Pistahh [n=szekeres@82-131-134-70.pool.invitel.hu] has quit [Read error: 110 (Connection timed out)] 16:40 -!- Pistahhh is now known as Pistahh 16:44 -!- orospakr [n=orospakr@132.213.238.4] has joined #git 16:46 -!- wacky_ [n=abourget@savoirfairelinux.net] has joined #git 16:46 < wacky_> Hey bundles are neat! 16:46 -!- engla [n=ulrik@062016192028.customer.alfanett.no] has joined #git 16:47 < wacky_> but there is a little bug in git-fetch when fetching from a bundle 16:51 -!- KirinDave [n=dfayram@c-67-160-204-118.hsd1.ca.comcast.net] has joined #git 16:52 -!- KirinDave [n=dfayram@c-67-160-204-118.hsd1.ca.comcast.net] has quit [Client Quit] 16:58 < coopsh> Can somebody point me to a manual page of gitweb? I want to have a set of distinct git repositories in the web interface 16:58 -!- sgrimm [n=koreth@c-76-21-111-212.hsd1.ca.comcast.net] has quit [] 17:00 < Mikachu> i think the easiest way is to make a subdir and symlink the wanted repos there 17:00 < Catfish> I applied half a patch, and committed the partially patched file. Now when I try and apply the patch again to try and get the remainder of the patch, it says patch does not apply. Is there any way of persuading it to do so, without manually editing the patch to remove the bits I've already applied? 17:00 < Mikachu> Catfish: how about reverting the partial commit and then applying the patch? 17:02 < Catfish> Mikachu: Mm.. the reason I was trying to separate it was its patching 2 totally separate things 17:02 < Mikachu> are they in separate files? 17:02 < Catfish> No, it's a single file 17:02 < Mikachu> but the hunks are completely separate? 17:03 < Catfish> Yeah 17:03 < Mikachu> then just apply it with 'patch' 17:03 < Mikachu> it'll skip hunks that reject and apply the rest 17:03 < Catfish> ah 17:03 < Mikachu> i think :) 17:03 < Mikachu> try it and commit, then try a patch -R 17:03 < Mikachu> or 17:03 < Mikachu> git reset --mixed to before you apply, then apply it and commit 17:04 < Mikachu> hm not --mixed 17:04 < Mikachu> isn't there a git reset --something that resets the working tree but not the index? 17:04 < Mikachu> heh 17:04 < Mikachu> anyway, you could get the file from before the partial commit and apply the patch in full, and git would only see the new changes then 17:05 -!- moh [i=mort@galileoii.bork.org] has quit [Remote closed the connection] 17:06 < Catfish> Do you usually have to use -p1 with git patches, to get around the --- a/file.c +++b/file.c ? 17:07 < Thumper_> Catfish: yes 17:07 < Catfish> fair enough. Just checking I wasn't doing something wrong... 17:07 -!- reinhold is now known as reinhold_away 17:11 -!- Oejet [n=s022018@bohr.gbar.dtu.dk] has quit ["Leaving."] 17:13 -!- michael [n=michael@MACGREGOR-SEVEN-FORTY-FIVE.MIT.EDU] has joined #git 17:14 < michael> Hello. Is there a way to compile git completely statically even though there are only shared libraries? I'd like to use the same binaries across different computers. 17:14 < michael> In other words, I'd like to know if there are some flags to set during compilation 17:14 < michael> I tried LDFLAGS=-static 17:14 < michael> but that didn't help; apparently that only looks for static libraries. 17:15 < michael> Perhaps it is not possible unless static libraries are around? I would think that shared library code could be linked in statically. Am I wrong about that? 17:16 < vmiklos> correct 17:16 < vmiklos> you need the static version of each lib if you want to compile something statically 17:16 < vmiklos> and in case of git, you still need perl (and other deps) since not every git command is a builtin (writte in C) 17:16 -!- bentob0x [n=laurent@ip-213-49-73-152.dsl.scarlet.be] has quit [Read error: 54 (Connection reset by peer)] 17:17 < michael> Perl is ok 17:17 < michael> But things like libcrypto vary in version 17:17 -!- Timotheo [n=Timotheo@207-114-255-134.static.twtelecom.net] has joined #git 17:17 < michael> I don't understand why dynamic symbol lookup/translation cannot be done at static link time 17:18 -!- moh [i=mort@galileoii.bork.org] has joined #git 17:18 -!- halfline [i=rstrode@nat/redhat/x-edbb93ee35438331] has quit [Read error: 104 (Connection reset by peer)] 17:19 -!- halfline [i=rstrode@nat/redhat/x-3db875bd950d573b] has joined #git 17:20 -!- Aeternus [n=Aeternus@cpc5-ptal1-0-0-cust7.swan.cable.ntl.com] has quit [Nick collision from services.] 17:20 -!- Aeternus [n=Aeternus@cpc5-ptal1-0-0-cust7.swan.cable.ntl.com] has joined #git 17:21 -!- Aeternus [n=Aeternus@cpc5-ptal1-0-0-cust7.swan.cable.ntl.com] has quit [Nick collision from services.] 17:22 < vmiklos> it can be done 17:22 < vmiklos> if you have the static libcrypto libs compile-time then you won't need them 17:23 -!- FunkeeMonk [n=funkeemo@cm34.delta221.maxonline.com.sg] has quit ["Gone."] 17:24 < michael> I don't 17:24 < michael> I'd like to do the dynamic look up at compile time rather than runtime 17:24 < michael> This seems like a pretty simple idea; I'm finding it hard to believe it's not possible. 17:25 -!- theCarpenter [n=Dragon45@bursley-220-128.reshall.umich.edu] has left #git [] 17:25 -!- wacky_ [n=abourget@savoirfairelinux.net] has left #git [] 17:25 < michael> To be exact.... I'm not sure why there are two types of libraries. There should be one type with which a binary can be statically or dynamically linked 17:25 -!- krawek [n=wyswyg@190.66.249.222] has joined #git 17:25 -!- Aeternus_ [n=Aeternus@cpc5-ptal1-0-0-cust7.swan.cable.ntl.com] has joined #git 17:26 -!- marcel [n=marcel@wc-50.r-195-35-150.atwork.nl] has quit [Read error: 104 (Connection reset by peer)] 17:28 < vmiklos> heh 17:28 < vmiklos> this is quite offtopic here.. 17:28 < Mikachu> michael: there is http://statifier.sourceforge.net/ but it produces slightly larger binaries than you get when compiling statically 17:32 < Mikachu> it seems to be possible to create a shared library from a static one, ar x file.a, ld -shared *.o -o file.so 17:32 < Mikachu> haven't tried actually linking to it though 17:35 -!- spearce [n=spearce@cpe-74-70-48-173.nycap.res.rr.com] has joined #git 17:37 -!- robinr [n=robin@h250n1fls32o811.telia.com] has joined #git 17:38 -!- dsop [n=dsp@ns.km20749-03.keymachine.de] has joined #git 17:38 < dsop> hmm is there a way to import mercurial repositories into git? 17:39 < MadCoder> probably tailor 17:45 < robinr> hgtogit 17:45 < robinr> in contrib I think 17:46 < Ilari> Mikachu: Don't do that. 17:46 -!- p4tux [n=p4tux@189.169.95.23] has joined #git 17:47 < Mikachu> which part? 17:47 < Ilari> Mikachu: For one thing, the thing will then contain lots of text relocations, pretty much negating any memory benefit. Secondly, SELinux doesn't like libraries performing text relocations very much. 17:48 -!- praka [n=praka@cpe-76-169-156-234.socal.res.rr.com] has joined #git 17:49 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has joined #git 17:49 -!- krh [i=krh@nat/redhat/x-00319f686754c893] has joined #git 17:50 -!- praka [n=praka@cpe-76-169-156-234.socal.res.rr.com] has quit [Client Quit] 17:51 < madduck> MadCoder: http://git.madduck.net/v/misc/vim-git.git 17:51 < madduck> and anyone else using vim... 17:52 < madduck> tpope started this, i added git-send-email 17:52 < madduck> patches welcome. 17:52 < madduck> his repo: git://git.tpope.net/~tpope/vim-git.git 17:53 < coopsh> once I did git-cvsimport I just want to do a git pull the next time 17:53 < coopsh> what do I have to configure? 17:53 < Mikachu> no, you have to run git-cvsimport in the future too 17:55 < michael> Mikachu: I gave statifier a try. It's too rough and wants to be installed in the wrong places. 17:55 < Mikachu> okay, i've never tried it myself 17:55 < michael> thanks though 17:56 < tokkee> madduck: Are you going to (try to) push it into git-core? 17:56 < madduck> tokkee: i was thinking more vim-runtime 17:56 < madduck> but yes. 17:56 < madduck> definitely debian, hopefully upstream. 17:57 < tokkee> madduck: I think it rather belongs into git-core. Else you'd have to upgrade vim-runtime in order to get a "complete" git upgrade... 17:57 < madduck> huh? 17:57 < tokkee> "complete" as in: including the (git related) vim stuff ;-) 17:58 < madduck> ls /usr/share/vim/vim71/ftplugin /usr/share/vim/vim71/syntax 17:58 < madduck> these are vim syntax files, i think they should be shipped with vim 17:59 < madduck> okay, in this case you are probably never going to need them without git installed 17:59 < madduck> but actually, yes... vim .git/config 17:59 < madduck> no, i think they belong in vim-runtime 17:59 < tokkee> Well, you could argue either way - do what you like most ;-) 17:59 < madduck> true 18:00 < madduck> tpope: can i write a mail to the list and invite more testers? 18:00 < madduck> don't want to hijack your project 18:01 < tpope> please do 18:01 < tpope> I'd love to but someone had the brilliant idea of having the programmer help with the office move 18:01 < madduck> hehe 18:03 < michael> Mikachu: Well, I've got it running after some hacking about. Let's hope it works! 18:04 -!- thiago [i=thiago@kde/thiago] has quit ["Gone for travelling"] 18:07 < tpope> "it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change" 18:07 < tpope> is there a particular origin of that 50, and should "less than" be read as "no more than"? 18:08 -!- z3ro [n=z3ro@60-234-138-172.bitstream.orcon.net.nz] has quit [Read error: 113 (No route to host)] 18:13 < MadCoder> mailers like mutt and others prints the date and sender and some things then the subject 18:13 < MadCoder> and you don't want it to clip 18:13 < MadCoder> that gives around 50 chars then 18:14 < MadCoder> I suppose that's where the limit comes from 18:14 < MadCoder> (and if it's not for _this_ reason, I suppose it's for one that is isomorph to this one) 18:15 < tpope> I get why in general, I was wondering if 50 is special 18:15 < MadCoder> a terminal is 80 chars 18:15 < MadCoder> do the math 18:15 < MadCoder> :) 18:15 -!- z3ro [n=z3ro@60-234-138-172.bitstream.orcon.net.nz] has joined #git 18:15 < madduck> MadCoder: git-core on backports.org depends on lenny's libc6... 18:16 -!- KirinDave [n=dfayram@208.76.47.86] has joined #git 18:16 < MadCoder> madduck: really ? FSCK 18:16 < MadCoder> I did it again 18:16 < tpope> special might be "such and such log format shows 30 columns of metadata and leaves the rest for the log message" 18:16 < madduck> i think so. 18:16 < MadCoder> yeah used the wrong pbuilder 18:16 -!- drizzd_ [i=drizzd@84.154.106.166] has joined #git 18:17 < madduck> MadCoder: http://svn.madduck.net/pub/bin/debian/dbuild automatically guards against that, might be trivial to add something like that to your scripts... 18:17 < MadCoder> madduck: rebuild in progress 18:17 < madduck> MadCoder: :) 18:17 < madduck> i love debian turnaround times. 18:17 -!- michael [n=michael@MACGREGOR-SEVEN-FORTY-FIVE.MIT.EDU] has quit [] 18:17 < tpope> I am asking because I am flagging characters after 50 as an error in the syntax file, but that seems silly if 50 is just a rough guideline 18:17 < MadCoder> yeah I should have a guard in my [builder 18:17 -!- fhobia [n=fhobia@c-24-6-54-200.hsd1.ca.comcast.net] has joined #git 18:17 -!- strangy [n=ivica@78-3-125-57.adsl.net.t-com.hr] has joined #git 18:18 < MadCoder> tpope: I think it's a rough guideline 18:18 < madduck> tpope: maybe use something other than error. 18:18 < MadCoder> well actually I'm sure 18:18 < madduck> i think it's cool that they're highlighted 18:18 < tpope> okay 18:18 < tpope> I can just highlight the first 50 special 18:18 < MadCoder> madduck: thanks to have spotted that btw 18:18 < madduck> tpope: it should definitely be an error if line 2 is non-empty... 18:19 < madduck> not sure if you can encode that 18:19 -!- z3ro [n=z3ro@60-234-138-172.bitstream.orcon.net.nz] has quit [Client Quit] 18:19 < tpope> you think so? 18:19 < MadCoder> yes 18:19 < MadCoder> you should check that, it gives really awkward issues 18:19 < madduck> which does seem silly 18:19 < MadCoder> and yes madduck it's doable 18:19 < madduck> everything is doable in vim... 18:19 < tpope> probably, I just think that's less useful to convey (I know to leave the second line empty, but getting it under 50 takes more care) 18:20 < robinr> coopsh: set up a separate repo for cvsimport (or some other better alternative) in a cron job. Then you can pull from that one. 18:21 < coopsh> robinr: nice idea. 18:22 < tpope> git log --pretty=oneline actually leaves just 39 characters for the log message :/ 18:23 -!- spearce [n=spearce@cpe-74-70-48-173.nycap.res.rr.com] has quit [Read error: 110 (Connection timed out)] 18:24 -!- gitte [n=gitte@138.251.11.74] has joined #git 18:24 < coopsh> tpope: do you know of a public vim git repository? 18:24 < tpope> you mean for vim as a whole? no 18:24 < tpope> there's cvs mirrors and svn mirrors 18:24 < gitte> Google comes up with this: http://git.altlinux.ru/archive/v/vim.git/ 18:24 < gitte> Not even half a minute of a search ;-) 18:25 < robinr> coopsh: I've done that since about a year ago, but switch to fromcvs later on since cvsimport had a tendency to break occasionally 18:25 < coopsh> yes, but I tought of a 'trusted' source ;) 18:25 < gitte> http://ftp.altlinux.com/pub/people/raorn/scm/packages/vim.git/ better? 18:25 < robinr> break = create broken imports 18:25 < coopsh> gitte: okay okay ;) 18:27 < gitte> coopsh: FWIW I'd fetch both, compare the commit names of "master", and be reasonably certain that no tinkering took place if both are identical. 18:27 < madduck> coopsh: or make one on repo.or.cz and announce it to the vim list 18:27 -!- z3ro [n=z3ro@60-234-138-172.bitstream.orcon.net.nz] has joined #git 18:27 < gitte> To be sure, I'd then checkout the official sources, import that into git, and compare the tree names. 18:28 < coopsh> hehe 18:29 -!- aroben [n=adamrobe@17.203.15.154] has joined #git 18:30 -!- drizzd [i=drizzd@p549A4C1D.dip.t-dialin.net] has quit [Read error: 110 (Connection timed out)] 18:30 -!- orospakr [n=orospakr@132.213.238.4] has quit [Remote closed the connection] 18:32 < robinr> I have made occasional cvs checkout and diff'ed with the git checkout. that is the only reliable way. I don't trust the two exporters to check each other 18:32 -!- sgrimm [n=koreth@out156.sctm.tfbnw.net] has joined #git 18:32 < robinr> there is one thing not to do with fromcvs. don't let anyone but fromcvs mess with it, i.e. don't push to it. 18:33 -!- HackyKid [n=simon@ip5655e868.adsl-surfen.hetnet.nl] has joined #git 18:33 -!- branstro1 [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has joined #git 18:34 < gitte> Hi HackyKid! 18:34 < gitte> Thank you very much for msysperl 18:34 < HackyKid> heya gitte 18:34 < HackyKid> heh, you're welcome :-) 18:35 < HackyKid> did you test if it works for you too? 18:36 < gitte> Sorry, didn't have time yet. 18:36 < HackyKid> ah 18:36 * robinr <3 rebase -i 18:36 < gitte> robinr: something wrong? 18:37 < robinr> no, not at all :) 18:37 < robinr> missing gui perhaps 18:38 < gitte> robinr: sorry, I could not interpret "<3" as anything else than "I sh*t on". 18:38 < robinr> I don't use stacked git anymore 18:38 < robinr> it's a heart, 18:38 < gitte> Oh. 18:38 < gitte> ;-) 18:38 < tpope> well madduck, thanks for drawing attention to the fact I had failed to add the right email to .gitconfig on my server box :) 18:38 < robinr> maybe only known on swedish channels :) 18:38 < gitte> Isn't there some UTF-8 character for a heart? 18:39 -!- Oejet [i=proxyuse@cpe.atm2-0-1071147.0x3ef2a7ea.boanxx10.customer.tele.dk] has joined #git 18:39 < robinr> yes \u2665 18:39 < gitte> Hehe. 18:39 < HackyKid> acii 1 or so it a heart too :-p 18:39 < gitte> A black heart. 18:39 < HackyKid> hmm, no, not 1 i think 18:39 < gitte> HackyKid: is it? Or is it some DOS code page? 18:39 < robinr> no, it's a control character (invisible) 18:40 < madduck> tpope: lol. :) 18:40 < robinr> on commodore 64 maybe 18:40 < HackyKid> ah, yeah, probably the DOS code page yeah 18:40 < robinr> not DOS 18:40 < robinr> it's control characters there too 18:41 < HackyKid> yeah, but they are visible there 18:41 < HackyKid> well, they can be 18:41 < tpope> I don't suppose I can fix that in the repo without screwing up everyone who cloned from me can I? 18:41 < HackyKid> and if you directly write to video mem (which you do for speed :-p), its not interpretted as control char 18:42 -!- KirinDave [n=dfayram@208.76.47.86] has quit [] 18:43 * workkevin seems to recall ASCII 1 being SOH (start-of-header), whatever that means 18:43 < robinr> exactly that 18:43 < robinr> header starts here 18:43 < HackyKid> yeah, but heart wasnt 1, 1 was a smilie face or somehting 18:44 < workkevin> I've seen it used in some network protocols to indicate -- you'll never guess -- the start of a header 18:44 < robinr> synchronous block mode terminals, 3270 sty"oe 18:44 < Ilari> U+2661 and U+2665 are hearts... 18:44 < HackyKid> i used it as the 'player' in the first games i made :-p 18:45 -!- fhobia [n=fhobia@c-24-6-54-200.hsd1.ca.comcast.net] has quit [Connection timed out] 18:46 < robinr> syncronous serial protocols send NUL's instead of nothing, so 0x01 is the signal that means, listen up 18:46 < robinr> quite obsolete nowadays 18:46 -!- leonardop [n=leonardo@gentoo/developer/leonardop] has joined #git 18:47 < Ilari> Most linux terminal emulators print nothing for NUL. 18:48 < robinr> true, but otoh, they use asynchronous serial protocols so when there is no data they don't even get NUL characters 18:48 < Ilari> I meant it as: "Maybe a leftover from those days"... 18:49 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has quit [Read error: 110 (Connection timed out)] 18:49 < robinr> i doubt linux ever had to deal with synchronous serial protocols 18:49 < robinr> kind of old, very old "IBM:ishy" thing 18:50 < Ilari> robinr: Yes, not Linux, but if some older Unix had to deal with them... 18:52 < robinr> thay may be true 18:53 < robinr> still I think communications hw probably listened to those characters and filter out the non-data NUL's 18:53 < robinr> just like asyncrhonous hw takes care of the start and stop bits 18:56 < Ilari> Probably Unix also has had to deal with them... Look up "screaming tty"... 18:57 -!- branstro1 is now known as branstrom 18:57 -!- anonuser [n=sean@206.174.228.229] has quit ["quit"] 18:57 -!- anonuser [n=sean@206.174.228.229] has joined #git 18:58 < robinr> doesn't sound like the same 18:58 -!- namenlos [n=richi_au@c703-fwngw.uibk.ac.at] has quit ["leaving"] 18:59 < Ilari> robinr: Do RS232 ports (when connected with minimum wiring) scream? 19:00 < Ilari> robinr: Or actually not connected... 19:02 < robinr> not unless badly wired, but probably could if connected to someting without or with bad ground 19:03 < robinr> nevertheless RS232 is not synchronous 19:03 < Ilari> robinr: No, they don't scream. 19:03 -!- rtmfd_icbm [n=ijbaird@dsl093-152-122.phx1.dsl.speakeasy.net] has joined #git 19:04 -!- KirinDave [n=dfayram@chisai.desk.hq.powerset.com] has joined #git 19:05 -!- cortila [n=sam@85-211-18-55.dyn.gotadsl.co.uk] has quit [Remote closed the connection] 19:07 < gitte> robinr: I played with the idea of putting something like rebase -i into git-gui... 19:08 -!- drizzd [i=drizzd@p549A4CB4.dip.t-dialin.net] has joined #git 19:14 < robinr> not gitk? 19:15 -!- engla [n=ulrik@wikipedia/Sverdrup] has quit [Read error: 110 (Connection timed out)] 19:19 < krh> fonseca: what do you think about this parse_options() behaviour: 19:19 < krh> * parse_options() will filter out the processed options and leave the 19:19 < krh> * non-option argments in argv[]. The return value is the number of 19:19 < krh> * arguments left in argv[]. 19:19 < Mikachu> how about passing in &argc and &argv? 19:20 < krh> that's what I did before 19:20 < Mikachu> ah 19:20 < krh> but (*argv)++ and the like is kinda icky 19:21 < Mikachu> char **argv = *argv_p; 19:21 < krh> sure... but this feels like a better api to me 19:22 < Mikachu> but uh, if you don't pass in the pointer to argv, how does the caller know where the changed argv is? 19:22 < krh> Mikachu: you just change the pointers in argv[] 19:22 < Mikachu> ah right, i am silly 19:22 < workkevin> Technically I don't know if you are supposed to do that 19:23 < workkevin> Strictly speaking 19:23 < Mikachu> as long as you don't need to grow the array 19:23 < Mikachu> then realloc might decide to move it 19:23 < gitte> robinr: no, not gitk. It is a viewer. I find it disgusting that it learnt some non-viewing functionality which would belong into git-gui. 19:23 < krh> yeah, we never need to grow, we're just picking out the options that have been handled 19:24 < workkevin> Oh, are you guys not talking about the argv argument to main()? 19:24 < Mikachu> can't do much about that one 19:24 < krh> workkevin: we are, but why is that a problem? 19:24 < gitte> krh: I usually do this thing with two counters, i and j, where i is incremented for every option, j only when a parameter was moved (to argv[j]). 19:24 < workkevin> Well, the realloc... I wouldn't expect that to work on argv 19:25 < krh> gitte: that's what I have here :) 19:25 < krh> else if (!parse_one(argv[i], options, count, usage_string)) 19:25 < krh> argv[j++] = argv[i]; 19:25 < gitte> krh: heh. 19:25 * gitte likes it 19:25 < gitte> ;-) 19:25 < krh> it's a nicer interface, fonseca had some good comments there 19:25 < Mikachu> workkevin: hm yeah, maybe not realloc but malloc and return another pointer 19:25 -!- drizzd_ [i=drizzd@84.154.106.166] has quit [Read error: 110 (Connection timed out)] 19:25 < Mikachu> workkevin: but in any case apparently we aren't doing either :) 19:26 < krh> workkevin: ah, no, you can't realloc argv :) 19:26 < Mikachu> if you do change the existing argv, won't that change what ps shows and what's in proc, etc? 19:26 < Mikachu> it would be weird if only the options passed to parse_options disappear :) 19:26 < workkevin> I think in general I would not change argv, just on principle... but I don't know of a compelling argument, just a preference 19:27 < Mikachu> maybe better to always allocate a separate argv** and play with that 19:27 -!- strangy [n=ivica@78-3-125-57.adsl.net.t-com.hr] has quit ["Leaving"] 19:30 < workkevin> FYI, I checked and the C standard explicitly says you CAN modified argv, including the strings themselves. I have no idea what the effect would be on proc. 19:30 < gitte> We would not really break things here: revision.c already does it. 19:31 < gitte> I'd be surprised if proc shows anything different when you change argv[i]. 19:31 < gitte> It should only change when you modify argv[i][j] 19:31 < Mikachu> it seems modifying argv[i] is fine, but modifying argv[i][j] does affect /proc 19:32 < Mikachu> or what gitte said 19:32 < gitte> Hehe. 19:32 < Mikachu> i actually tried too :) 19:32 < tokkee> Yes, that's how passwords are "hidden" from /proc afaik. 19:32 < gitte> I tried to think how I'd implement the command line parsing ;-) 19:32 < Mikachu> okay, then you can disregard everything i said before :) 19:33 < Mikachu> heh, you have to change every character to 0 apparently 19:34 < gitte> Or to '*' 19:34 < Mikachu> since /proc/pid/cmdline is NUL-separated already anywy 19:34 < gitte> But putting pwds on the command line is _never_ safe. 19:35 < gitte> There is a time span -- however brief -- when it is visible. 19:35 < Mikachu> of course, it's a race 19:35 < Mikachu> at the moment i am mostly amazed i remembered the argument order to memset() 19:36 < workkevin> Yeah, there's a lot of inconsistency in arguments to memset-like functions, especially in C++ 19:36 < workkevin> I think C mostly uses the target, source order. 19:37 < Mikachu> memset is target, data, length 19:37 < workkevin> So you can remember it by the order being the same as target = source. 19:37 < Mikachu> or you can consider data the source 19:37 < workkevin> But then C++ copy() etc. are different, I think. 19:38 < workkevin> Sorry for bringing up C++ here. I know it's a 4-letter word. ;) 19:39 < gitte> workkevin: no problem. I do not have too much against C++. 19:39 < gitte> (Let the flame war start all over again...) 19:40 < Mikachu> i have a better idea: don't let it :) 19:40 < workkevin> Aaargh! I've been working on the wrong branch. 19:41 < Mikachu> git checkout -m! 19:41 < workkevin> I need some more of those 4-letter words now 19:42 < workkevin> I think it's going to be a bit more tricky... I thought I did this yesterday, but I need to move all these changes to a different git-svn remote 19:43 < workkevin> Oh, wait. Maybe I did do it yesterday. 19:44 < workkevin> I think my git branch just has an unfortunate name. 19:44 -!- orospakr [n=orospakr@132.213.238.4] has joined #git 19:44 < gitte> workkevin: just rename it. 19:44 < gitte> git branch -m new-name 19:44 < gitte> Works on the current branch. 19:44 < workkevin> I think I rebased it to where it needed to be, and left the name the same (refering to the original branch) 19:45 < workkevin> Yeah, it's no problem. It just scared me. 19:47 -!- _tux68_ is now known as loops 19:57 -!- wycats [n=ykatz@207.71.248.76] has joined #git 19:57 < wycats> Is there a way to push a local branch to the remote repository? 19:58 -!- chris2 [n=chris@91.22.191.131] has joined #git 19:59 < gitte> wycats: "git push "? 19:59 < wycats> if I already cloned a remote repos 19:59 < wycats> so I would normally do git push 19:59 < wycats> can I do git push 19:59 < wycats> ? 19:59 < wycats> or can I just do git push from within the branch? 20:02 -!- mgrimes [n=mark@cpe-76-88-47-191.san.res.rr.com] has quit ["Leaving"] 20:03 < gitte> No, you have to specify a remote name. 20:03 < gitte> But since you usually say "git push", I suspect that you want to push to the "origin" remote. 20:04 < gitte> ("git push" is a shortcut for "git push origin ") 20:08 < wycats> got it 20:08 < wycats> so git push origin 20:08 < gitte> Yes. 20:09 < wycats> and the just git pull in the branch? 20:09 < wycats> or git pull 20:09 < gitte> git pull also wants a remote name first. 20:10 < wycats> git pull origin 20:10 < wycats> inside the branch? 20:10 < gitte> Yep. 20:10 < wycats> and how do I get rid of the remote branch when I'm done with it? 20:10 < gitte> git push origin : 20:10 < gitte> (Note the colon) 20:10 < wycats> why doesn't git pull detect that you're in a branch and automatically pull from the remote branch, if it exists :P 20:11 < wycats> or wait 20:11 < wycats> will git pull get everything? 20:11 < wycats> including the branches? 20:11 -!- cortana` [n=sam@79-74-132-55.dynamic.dsl.as9105.com] has joined #git 20:12 < Ilari> wycats: You can configure what branch from what remote 'git pull' fetches by default on per-branch basis. 20:13 < wycats> ilari: is there docs somewhere on how to do that? 20:13 < Ilari> wycats: The option names are 'branch.foo.merge' and 'branch.foo.remote' (foo is name of branch). 20:14 < wycats> in .git? 20:15 < Ilari> wycats: There is 'git config'. 20:16 < wycats> ah 20:16 < Ilari> wycats: It can be set up like: "git config branch.foo.merge refs/heads/bar" "git config branch.foo.remot baz". Meaning when on branch 'foo', fetch branch 'bar' from remote 'baz'. 20:16 < Ilari> s/fetch/pull/ 20:17 < Ilari> s/remot/remote/ 20:17 < wycats> can I use origin? 20:17 < wycats> branch.foo.remote origin? 20:17 < Ilari> wycats: What makes you think that it is any way special except for being default in some cases? 20:18 < wycats> I guess it's not ;) 20:18 < Ilari> Yes, origin should work (if there is such remote defined)... 20:19 < wycats> and refs/heads will work with pretty much any remote? 20:19 < wycats> refs/head/branchname? 20:19 < Ilari> wycats: s/head/heads/, otherwise yes. Branches are stored inside refs/heads/... 20:20 < wycats> and that'll work for git push as well? 20:20 < wycats> or do I still need git push origin 20:21 < Ilari> wycats: 'git push' IIRC takes remote to use from branch.foo.remote, but is unaffected by branch.foo.merge... 20:21 < Ilari> wycats: But once you have pushed that branch, then 'git push' should push it. 20:22 < wycats> cool 20:22 < Ilari> wycats: 'git push foo bar' or 'git push foo --all' is only required to push branches for the first time. 20:23 < wycats> so git push foo --all the first time 20:23 < wycats> subsequently git push foo 20:26 < Ilari> wycats: IIRC, If you have set up branch.foo.remote and have already pushed, you can push current branch with just 'git push'. AFAIK, 'git push foo' means push to remote foo... 20:26 < wycats> k 20:27 < madduck> why do i want denyNonFastForwards when I have multiple committers? 20:27 < madduck> i can't figure it out. i know the high-level theory about commits getting lost otherwise, 20:27 < madduck> but I can't figure out how that would happen. 20:28 < Ilari> madduck: So nobody pushes things losing data lightly... There are people who try things and then add -f when they don't work... 20:28 -!- dkagedal [n=david@dns.vtab.com] has left #git [] 20:29 < madduck> i don't understand... 20:29 < Orangebat> Anyone have a script that will add all currently untracked files to .gitignore files in their directories? 20:29 < gitte> madduck: it's not about commits getting lost. It's about forcing the other devs to merge. When they probably do not want to. 20:30 < Ilari> Orangebat: In their directories, no, but 'git ls-files --others >>.gitignore' might work... 20:30 < madduck> Orangebat: git-ls-files --others 20:30 < gitte> Orangebat: how about "git ls-files --untracked > .gitignore"? ;-) 20:30 < gitte> Oops. --others. 20:30 < madduck> gitte: i cannot find --untracked 20:30 < madduck> yeah.. 20:30 < gitte> Thanks, madduck 20:30 -!- Surma [n=crock@c212178.adsl.hansenet.de] has joined #git 20:30 < gitte> And thanks Ilari: I'd overwrite .gitignore. 20:31 < jrockway> hmm, am i delerious or did "git push origin foo:foo" used to create a foo branch remotely 20:31 < jrockway> i don't remember ever typing ...:refs/heads/foo 20:31 < jrockway> :) 20:31 < gitte> No. 20:31 < gitte> git push origin foo did. 20:31 < Ilari> gitte: After being burned by branches in SVN? :-) 20:31 < Surma> Hey guys. Is there a way to prevent git-commit from nagging about trailing whitespaces? 20:32 < gitte> Ilari: I avoid SVN where possible, so I was only burnt once, when I could not undo an erroneous commit... 20:32 < jrockway> Surma: remove the trailing whitespace :) 20:32 < Orangebat> Thanks guys. I had the '--others' solution, but was looking for a way to move then in to their local directories 20:32 < jrockway> Surma: git warns because that can screw up your history (git blame) needlessly later 20:32 -!- nud [n=sf@91.86.94.154] has joined #git 20:35 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has quit [Read error: 110 (Connection timed out)] 20:39 -!- meandtheshell [n=markus@85.127.105.233] has quit ["Leaving."] 20:40 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has joined #git 20:43 -!- Surma [n=crock@c212178.adsl.hansenet.de] has quit ["Leaving."] 20:43 < Ilari> gitte: What, SVN doesn't have equivalent of 'git revert HEAD*? 20:43 < madduck> git-clone does not work when the source repo has no commits 20:43 < madduck> but when you pass -s, it does work 20:44 < gitte> Ilari: what do I know... ;-P 20:44 < madduck> but does not set up a remote tracking branch unless the URL starts with :// or / 20:44 -!- mneisen [n=mneisen@217.229.58.88] has joined #git 20:44 < madduck> is that a bug? 20:44 < gitte> madduck: yes. In you repo ;-) 20:45 < madduck> how so? 20:45 < madduck> why does using -s allow an empty HEADless repo to be cloned? 20:45 < madduck> and why does the remote tracking branch depend on an absolute url? 20:46 -!- Ken|JLime [n=kristoff@80.251.192.3] has joined #git 20:47 < Ken|JLime> I moved my git repository to a new server and want to be able to give rights to a group. Ive set the core.sharedRepository = true, but how can I state the group I want access... AND update the repository so all file permissions are reflected? 20:47 < Ken|JLime> If possible I would like to avoid creating a new git repository only to have that working 20:49 -!- Timotheo [n=Timotheo@207-114-255-134.static.twtelecom.net] has quit ["Snak 5.3.1 IRC For Macintosh - http://www.snak.com"] 20:49 < cehteh> some manual tinkering with umasks, permissions (sgid, writeable) etc then it will work 20:50 < gitte> madduck: you did not really clone the empty repo. And that -s works is most likely a bug. 20:50 < gitte> madduck: to say "clone an empty repo" is as saying: I have a vacuum here in my lab, which is an exact copy of the vacuum somewhere at the end of the universe. 20:51 < madduck> right, i understand that much 20:51 < madduck> so the -s is a bug... 20:51 < madduck> gitte: but wouldn't it be nice to be able to clone an empty repo just to have the remotes set up right away? 20:51 < Ilari> Ken|JLime: Do recursive setting of at least following permissions for direcories: u+rwx and g+rwxs, plus chgrp all directories in repo to apporiate group. 20:52 < Ken|JLime> Ilari, oki thanx 20:52 < Ilari> Ken|JLime: And ensure that files have g+r set... 20:52 < Ken|JLime> roger 20:52 < Ilari> Ken|JLime: Plus of course all files should be chgrp'd. 20:54 < gitte> madduck: personally, I find empty repos utterly uninteresting. And I will not even waste time setting up a local "clone" until the remote side has something to show. 20:55 < Ilari> Ken|JLime: Standard Unix permissions stuff, execpt that sharedRepostory thing (it forces group permissions on new files to match user permissions, overriding umask). 20:55 < madduck> gitte: fair enough, but... 20:55 < madduck> i am sure you saw http://blog.madduck.net/vcs/2007.07.11_publishing-git-repositories 20:56 < madduck> all this is necessary because I can't just do: 20:56 < madduck> one my public git server: GIT_DIR=/path/to/dir.git git --bare init --shared 20:56 < Ken|JLime> Oki, big thanx 20:56 < madduck> on my laptop: git clone ssh://.../dir.git; cd dir; make changes; git add .; git commit; git push 20:57 < madduck> gitte: it would just be easier. that's all. 20:58 < Ken|JLime> If I use shared will all pushes have same group as the original file? 20:59 < Ilari> Ken|JLime: Setgid bit on directories causes all files created to be implicitly "chgrped" to that group. 20:59 < Ken|JLime> oki thx 21:00 < gitte> madduck: if you make a good case, you might succeed with a patch that makes "git clone" on empty repos succeed. 21:02 < madduck> gitte: yeah, i might have to have a shot at that. if only i had more time. 21:02 < madduck> i have another thing i cannot figure out 21:02 < madduck> can i make git-pull fetch from two remotes and merge them octopus into master? 21:03 < madduck> i tried branch.master.remote=. and branch.master.merge='refs/heads/remotes/A/master refs/heads/remotes/B/master' 21:03 < madduck> but that does not work. 21:03 < Randal> set up an alias? 21:03 < Randal> or a script? 21:03 < madduck> well, yeah. 21:03 < madduck> i was more wondering if i could make git-pull do it automatically 21:03 < Randal> git-fetch remote1; git-fetch remote2; git-merge remote1 remote2 21:04 < Randal> I can't imagine needing to do that on a routine basis 21:04 < Randal> what's your workflow that results in that? 21:05 < madduck> i work on proj from office with someone in another city, push my stuff to public repo as i leave, the person also pushes, and when i get home, i just want to git-pull and get both changes 21:05 < Randal> they push into a different repo? 21:05 < madduck> yeah 21:05 < madduck> we pull from each other 21:05 < Randal> sounds rare enough that a script would probably be teh right way 21:05 < Randal> I can't imagine modifying core utils to do that 21:06 < Randal> in fact, why aren't you rebasing instead of merging? 21:06 < Randal> just fetch both before you go 21:06 < Randal> then rebase your new changes on top of that 21:07 < Randal> in general, unless you have published, you should be rebasing 21:07 < gitte> And why not do that independently of another? You don't need an ugly octopus. 21:07 < Randal> leave the seafood to Linus. :) 21:07 < Mikachu> surely your home repo should always be a fast-forward of your office repo? 21:08 -!- chris2 [n=chris@91.22.191.131] has quit ["Leaving"] 21:08 < Randal> that too 21:08 < gitte> Randal: AFAIK Linus detested octopus merges from day 1. 21:08 < Randal> well - someone added them. :) 21:09 < Mikachu> i like this one http://mikachu.ath.cx/thatsonewaytodoit.png 21:09 -!- engla [n=ulrik@062016192028.customer.alfanett.no] has joined #git 21:09 < gitte> Randal: that was our good maintainer, Junio. 21:09 < Ilari> gitte: Wasn't the original rationale: "Many respectable SCMs can't represent them.", or something like that? 21:10 -!- jrmuizel [n=jrmuizel@142.76.1.62] has joined #git 21:10 < gitte> No I think it was more: "does not reflect the way we work". 21:10 < Randal> You say that like tehre's also a bad maintainer. :) 21:10 < gitte> And "is hard to resolve when there are conflicts" 21:10 < gitte> And "is ugly to look at" 21:10 < gitte> And... I'll stop here. 21:11 -!- twilight\ [n=ask@89.10.28.56] has quit [No route to host] 21:11 < madduck> Randal: i know what rebasing it, i can imagine what the advantages are, but I don't see why it's so much better than merging 21:11 < gitte> Randal: No, I say this because I think we have a darned good maintainer. 21:11 < Randal> ok 21:11 -!- Pistahh [n=szekeres@87.97.109.171.pool.invitel.hu] has quit ["leaving"] 21:11 -!- Pistahh [n=szekeres@87.97.109.171.pool.invitel.hu] has joined #git 21:11 < gitte> madduck: did you look at the link Mikachu sent? 21:11 < madduck> gitte: thanks, looking... 21:11 < gitte> It's totally confusing. 21:11 < gitster> Itari is correct there and it was not like "detested the octopus merges from day 1" AFAIR. 21:12 < gitte> madduck: With rebasing, you pretend a linear workflow... which is much nicer to look at, and much nicer to work with. 21:12 < gitte> gitster: my memory goes bad I think. 21:12 < madduck> but you should nt be rebasing if you publish the branch, right? 21:12 < Ilari> It doesn't appear to be that "the merge from hell". That thing has 12 parents (the merge depicted has only 8). 21:12 * gitte did too much work for the day job. 21:12 < madduck> or should you not be rebasing when you push the branch to the same repo that has the branch onto which you're rebasing? 21:12 < gitte> madduck: you can rebase _before_ publishing. 21:13 < madduck> hm. 21:13 < Randal> in fact, that's the normal way 21:13 < gitte> Ilari: but that's from Russel King... 21:13 < Randal> other wise, why have rebasing 21:13 < madduck> so i branch off master and do my work. master is updated so i fetch it and rebase on top of master 21:13 < Randal> if you never published a *rebased* branch, you're not contributing. :) 21:13 < madduck> i then publish my branch (A) 21:13 < gitte> madduck: exactly. 21:13 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has quit [Connection timed out] 21:13 < Mikachu> gitte: i was just scrolling through the linux log a week or so after i started using git 21:13 < madduck> now what happens if master updates and i make changes to A? 21:14 < gitster> Ilari: Hell 12 one was from Len. 21:14 < Randal> you fetch and rebase again 21:14 < Randal> repeat every time 21:14 < Randal> rebase before publishing 21:14 < madduck> so i can publish a branch i have rebased in the end? 21:14 < Randal> indeed! 21:14 < Randal> otherwise, as I said, rebasing would be useles 21:14 < madduck> so what would be a case when you should *not* rebase? 21:14 < Randal> just don't rewrite any commits that you've *already* published 21:14 < gitster> Randal: Yeah, I think the recent topic of "pull --magic-option" = "fetch + rebase" instead of "pull = fetch + merge" would have a use case there. 21:15 < madduck> Mikachu, gitte: that link, it's two octopus merges, right? 21:15 * gitte is off for an hour or two... 21:15 < madduck> Randal: but when i rebase a branch, don't i rewrite all commits? 21:15 < gitte> madduck: no, it is just one. 21:15 < Randal> arguably been off for a lot longer than that. :) 21:15 < Mikachu> madduck: only the ones since the common ancestor 21:15 < madduck> gitte: one by russell, one by linus... 21:16 < gitte> gitster: basically, this is the workflow by _non_ maintainers... 21:16 < madduck> Mikachu: ic... 21:16 < Mikachu> madduck: linus' is just a regular merge 21:16 < gitte> madduck: no, the first is a simple merge. 21:16 < madduck> true, now i see it. 21:16 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has joined #git 21:16 < gitte> madduck: it just crosses so many lines. 21:16 < Mikachu> you can just read the short log too :) 21:16 < gitte> It's an ugly viewer. 21:16 * gitte is really off now. 21:16 -!- jerbear [n=jerbear@216.54.203.74] has joined #git 21:16 < Mikachu> i had some trouble setting a nice font in gitk in the beginning 21:16 -!- Pieter [n=frim@72.249.127.116] has quit [Remote closed the connection] 21:16 < Mikachu> had to edit the ~/rc file to make it not bold 21:16 < Ilari> Reminds me of 2 000 way octopus I did for testing purposes... Back then git-commit-tree overflowed buffer if there was more than 16 parents and I was running the hacked version so there was a lot of space to overrun without hitting anything important. 21:17 < Mikachu> besides i like qgit over gitk still :) 21:17 < Mikachu> (but not qgit2) 21:18 < madduck> so bear with me for another example about this, it'll be a bit longer 21:18 < madduck> mdadm upstream is in git; i track it as upstream/master, merged into local upstream branch 21:18 < madduck> off upstream, i branched debiandir for debianisation 21:19 < madduck> i branched upstream-patches off upstream for patches i submit upstream, and i also branched two deb-only/{A,B} branches for stuff only for debian 21:19 < madduck> when i make a release of mdadm for debian, i rebase master onto upstream 21:19 < tko> *sigh* I did it again.. pushed only not master branch to remote and new clones fail :-( 21:20 < madduck> and if i make any changes to debiandir (like increment the version), i then merge debiandir into master? 21:20 < Randal> that should be a fast-forward 21:21 < Randal> or not. confused now. 21:21 < madduck> me too. :) 21:21 < vmiklos> huh, it seem to be a bit overcomplicated to me :) but maybe i'm wrong 21:21 < madduck> vmiklos: my workflow? 21:21 < vmiklos> yes 21:22 < madduck> how would you do it? 21:22 < vmiklos> i would just have upstream, origin and my local branches. then i would push my patches to origin and cherry-pick the needed ones to a separate branch when i want to submit them 21:23 < madduck> okay, but i actually publish my local branches on git.debian.org 21:23 < vmiklos> yes, origin is git.debian.org 21:23 < madduck> right 21:23 < madduck> can we walk through this? 21:24 < madduck> so i pull upstream and i branch debiandir off 21:24 < madduck> make all the debian-specific stuff happen there 21:24 < madduck> push debiandir to origin 21:24 < madduck> and now you're saying that to make a release, i tag debiandir (and upstream, maybe) 21:24 -!- evan [n=evan@hoshi.fallingsnow.net] has joined #git 21:24 < madduck> create a throwaway branch 21:24 < evan> is there a reason that 'git stash apply' doesn't delete the stash? 21:25 < madduck> off upstream 21:25 < jrmuizel> anyone know of good way to have a default commit template for a repository? 21:25 < madduck> cherry-pick debiandir into there 21:25 -!- rodserling [n=rod@pool-71-124-155-16.bstnma.east.verizon.net] has joined #git 21:25 < madduck> make deb and delete the branch? 21:25 < tko> hmm.. I just cloned a repo over http and I only see the HEAD branch.. what am I missing? 21:25 < Mikachu> tko: branch -r? 21:25 < madduck> tko: git branch -r ? 21:25 < Mikachu> (tko: hi) 21:25 < tko> indeed.. 21:26 < madduck> MadCoder: are you listening in? 21:26 < vmiklos> madduck hm. i would fetch, then rebase master to upstream/master. then cherry-pick the needed patches to a feature branch, finally push the local branches to origin. once the topic branches are merged, you can remove them. it seem to be simpler to me (of course your method is right, just maybe you can save some work :) ) 21:27 < madduck> cherry-pick seems more work than merge... 21:27 < vmiklos> how many patches do you submit after a relase? avarage 0 or 1? :) - i assume 21:27 < madduck> nah, it could be more. 21:28 < madduck> plus, i'd like to keep things within debiandir separated 21:28 < vmiklos> aren't those patches independent from upstream releases? 21:28 < madduck> the debian ones, yes. 21:28 < madduck> not the ones i have in upstream-patches 21:28 < vmiklos> no, i mean the 'for-upstream' ones 21:28 < madduck> well, usually upstream will have them merged by the time the next release comes around. 21:28 < albertito> evan: I don't know, but a friend just ran into git troubles and that saved a lot of work =) 21:29 < evan> albertito: hm, good to know. 21:29 < evan> albertito: i find it odd that the only way to remove stashs is to delete them all. 21:29 -!- Pieter [n=frim@72.249.127.116] has joined #git 21:29 < madduck> evan: stash is supposed to be temporary 21:29 < albertito> evan: so if there is no real reason to delete them, I think it's nice to keep them around just in case 21:29 < madduck> evan: if you use it often, you should be using branches instead. 21:29 < vmiklos> you can have an alias like 'stashapply' that would stash apply && stash clear 21:29 < evan> madduck: oh, i agree. 21:29 < evan> i'm automatting some workflow stuff for developers 21:30 < evan> i suppose i shouldn't worry if they have stashs 21:30 < madduck> vmiklos: if i made a short demo repo, would you have the time to look at it? 21:30 < madduck> or anyone else? 21:30 < evan> i'll just stash; fix; apply; clear 21:30 < madduck> vmiklos: or actually, i'll write it up, i think 21:31 < vmiklos> madduck sure :) not that i would be better in git than you, just more eyes can catch more bugs:) 21:31 < madduck> k, but this is going to take a while, so i might have to ping you again tomorrow or even later 21:32 < vmiklos> that's okay, no rush 21:38 < evan> whats the best way to find out the name of the current branch? 21:38 < evan> there must be something better than 'git branch | grep "*"' 21:38 < madduck> git branch | grep '^\*' 21:38 < madduck> :) 21:38 < Mikachu> git-name-rev HEAD 21:38 < evan> git branch needs another option then 21:39 < evan> git branch -o 21:39 < evan> or something. 21:39 -!- up_the_irons is now known as irons|lunch 21:39 < evan> Mikachu: close, but still extra stuff is output. 21:39 < Mikachu> only one line with two words 21:39 < Mikachu> and the first is always HEAD 21:39 < evan> true 21:40 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has quit [Connection timed out] 21:41 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has joined #git 21:43 -!- DrNick [i=fake@c-67-183-84-122.hsd1.wa.comcast.net] has joined #git 21:49 < madduck> so, uh, if i want to prepare a patch, I branch off the master branch, right? 21:50 < madduck> netx and pu are used by junio to cherry-pick/stage stuff for testing, right? 21:50 < gitster> Not really. 21:50 < MadCoder> madduck: I wasn't 21:51 < MadCoder> damn, is d. kastrup joking with -Oprofile ? 21:51 < madduck> MadCoder: no worries, i am writing something up and i shall send it to you for comments anyhow. 21:51 -!- wolf^ [i=wolf@pld-linux/wolf] has quit [Read error: 110 (Connection timed out)] 21:54 < madduck> gitster: i cannot find that document where you explain the branches 21:55 < madduck> and the SubmittingPatches doc does not mention it either 21:55 < gitster> madduck: I probably should update MaintNotes (posted after 'master' release as "Note from maintainer" on the list) in the todo branch; could you read it over and tell me what part needs clarification please? 21:55 < MadCoder> madduck: usually if it's a fix for the stable branch for a big bug (think RC ;p) it's to be done on top of master 21:56 < MadCoder> else base it on top of next 21:56 < madduck> ok 21:56 < madduck> gitster: yes, i will do that. you mean the list post? 21:56 < madduck> MadCoder: so since i am proposing a feature, i would thus branch off next... 21:56 < gitster> Either should be fine. I think MaintNotes in the todo branch is up-to-date now with the one posted to the list the last time. 21:57 < gitster> But the short version is this. 21:57 < gitster> maint and master are the primary "release" branches. 21:57 < gitster> Anything new that I need to think about for more than 5 minutes will _not_ get committed on these branches. 21:57 -!- Orangebat [n=obat@Torch.cs.Dal.Ca] has quit [Read error: 104 (Connection reset by peer)] 21:58 < gitster> Instead, (1) if it is a bugfix that applies to the last 4-digit release (maintenance), a new topic branch is created off of 'maint' and committed there; (2) otherwise a new topic branch is created off of 'master'. 21:58 < madduck> i am proposing to let git-clone clone empty HEADless repos simply because then the remotes are all set up and i can easily push to it 21:58 < madduck> http://colabti.de/irclogger/irclogger_log/git?date=2007-10-03,Wed&sel=621#l1055 21:58 < madduck> it's not necessary at all, just makes things simpler 21:59 < gitster> Then, the tip of the topic branch is merged to 'next' iff it is in testable shape (does not have obvious breakages and risk breaking things too badly for people who run 'next' version). 22:00 < gitster> The fixups will be done on top of each topic branches and merged to 'next' number of times, until the topic is perfected, at which time it is merged to 'master' or 'maint' depending on where it came from. 22:00 < gitster> The tip of 'maint is also merged to 'master' from time to time. 22:00 < madduck> and there seems to be a bug because git-clone -s already allows empty repos to be cloned. 22:01 < gitster> We could detect and forbid that if we really wanted to be consistent but I'd say why bother. Cloning nothingness is a user error anyway. 22:01 < gitster> In any case, what follows the branch management policy outlined above are: 22:01 < madduck> except for the use case when i know from a start that i want to create a new repo that i want published 22:02 < madduck> on my public git server: GIT_DIR=/path/to/dir.git git --bare init --shared; on my laptop: git clone ssh://.../dir.git; cd dir; make changes; git add .; git commit; git push 22:02 < madduck> would just be easier than http://blog.madduck.net/vcs/2007.07.11_publishing-git-repositories 22:02 < gitster> (0) a fix that applies to the released four-digit version should be made against 'maint'; 22:03 < gitster> (1) a fix or enhancement that does not depend on anything that is still cooking on 'next' should be made against 'master'; 22:03 -!- nessundorma [n=mike@host198-56-static.104-80-b.business.telecomitalia.it] has joined #git 22:04 < gitster> (2) an enhancement or a fix to a topic that is cooking on 'next' can be made against 'next' and have me sort it out, or alternatively you can "git log --first-parent next" to see where the tip of the topic branch you are fixing or enhancing is, and create a patch against that commit (and tell me that you did so); the latter would save me a lot of time if the topic can textually interact with other topics simultaneously cooking in 22:04 < gitster> 'next'; 22:06 -!- Ken|JLime is now known as Kristoffer 22:06 < madduck> ok, i shall read the doc with this in mind 22:07 < madduck> probably next weekend though 22:08 < gitster> take your time. I won't be gitting the coming weekend. 22:09 < madduck> gitster: what do you say about the cloning empty repos 22:09 < madduck> should i bother writing up a patch or just keep a local script... 22:12 < Arjen> I'm curious if someone has an explanation to the question I asked earlier: http://colabti.de/irclogger/irclogger_log/git?date=2007-10-03,Wed&sel=250#l473 22:12 < gitster> What I say does not count as much as how others find it useful. I _suspect_ it is not worth it, but I've known to be wrong. You can push into an empty repository and you will be pushing into that repository many times from then on for publishing, so it would be good thing to make it easier to do that one time setting of "where do I push and how" would be a good thing but I do not think "cloning from void" is the way to do it. 22:12 < gitster> Is the "user's survey" still going on? Maybe we should take down the notice... 22:12 < madduck> gitster: good point. 22:13 -!- gitster changed the topic of #git to: 1.5.3.4 | Homepage http://git.or.cz/ | Everyone asleep or clueless? Try git@vger.kernel.org | Channel log http://colabti.de/irclogger/irclogger_log/git | Mailing list archives: http://marc.info/?l=git | Gits on git: http://tinyurl.com/2xq3ke | You want $ID?: http://tinyurl.com/yqpgv9 | User's Survey 2007 http://tinyurl.com/26774s 22:14 < madduck> Arjen: no idea, sorry. 22:16 -!- jcollie [n=jcollie@dsl-ppp239.isunet.net] has joined #git 22:16 -!- evan [n=evan@hoshi.fallingsnow.net] has left #git [] 22:17 -!- wycats [n=ykatz@207.71.248.76] has left #git [] 22:18 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has quit [Read error: 110 (Connection timed out)] 22:18 -!- branstrom [n=fredrik@ua-83-227-158-67.cust.bredbandsbolaget.se] has joined #git 22:19 < gitster> blame works harder and "git log" (git in general -- blame is just for fun and analysis) is not really interested in individual files. 22:21 < gitster> The output of "log -p" is meant to be consumed by traditional patch so it does not even do any file renames by default. If you give -M to ask it to look for rename, it will notice "ah, entire file A came from entire file B that disappeared", and say "rename B to A". There is no provision to say "concatenate B and C to create A". 22:23 -!- irons|lunch is now known as up_the_irons 22:23 < gitster> So you can say the inconsistency is deliberate. "log" is aiming towards producing something patch can apply (rename patch you can edit the headers to have rename-unaware GNU patch to apply, but that would become almost impossible if you do "concatenate" patch format). 22:24 < gitster> Does that answer the question? 22:24 < Arjen> Yes, but I have another one :-) 22:25 < Arjen> Uh no, I have to play around a bit more for that one :-) 22:30 < Arjen> When a chunk of code move from 'multiple' places to a new one, is it possible (with current git) to show *all* the sources? 22:31 < Arjen> s/move/is moved/ 22:31 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has quit [Read error: 110 (Connection timed out)] 22:32 -!- REPLeffect [n=REPLeffe@dialup-4.244.218.32.Dial1.StLouis1.Level3.net] has joined #git 22:34 -!- csc`` [n=csc@archlinux/user/csc] has joined #git 22:35 -!- alley_cat [i=AlleyCat@sourcemage/elder/alleycat] has joined #git 22:35 < vmiklos> you mean ie when foo() is moved from foo.c to common.c and bar() is moved from bar.c to common.c in the same commit? 22:36 < Arjen> No, when an identical piece of code is removed from foo.c and bar.c to common.c (a refactoring) 22:37 -!- metafollic [n=metafoll@75.127.75.145] has quit [Connection reset by peer] 22:40 -!- metafollic [n=metafoll@75.127.75.145] has joined #git 22:40 -!- troyt [n=troy@63.145.151.71] has joined #git 22:40 -!- mneisen [n=mneisen@217.229.58.88] has quit [Remote closed the connection] 22:40 -!- engla [n=ulrik@wikipedia/Sverdrup] has quit [Connection timed out] 22:41 -!- nud_ [n=sf@91.86.81.181] has joined #git 22:41 -!- nud [n=sf@91.86.94.154] has quit [Read error: 110 (Connection timed out)] 22:41 < troyt> Quick question: When I build git RPMs, I get an error about a failed dependancy: perl(Error) is needed by . What is the perl(Error) generally packaged with?