{"thread":{"id":"10172","subject":"git fetch -- double fetch","startedAt":"2007-10-06T18:57:59Z","lastAt":"2007-10-07T23:25:26Z","messageCount":5,"participants":["Andy Whitcroft","Johannes Schindelin","Daniel Barkalow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"55023","messageId":"20071006185759.GE28610@shadowen.org","threadId":"10172","inReplyTo":null,"subject":"git fetch -- double fetch","fromName":"Andy Whitcroft","fromEmail":"apw@shadowen.org","sentAt":"2007-10-06T18:57:59Z","receivedAt":"2007-10-06T18:57:59Z","isPatch":false,"sender":{"key":"apw@shadowen.org","avatar":"https://gravatar.com/avatar/d3088262854661a913ef35cc40fedcc270142d4461791142bc1ea0b2a4e2e147?d=mp&s=160"},"body":"I have recently been seeing repeated fetching of some branches.  I feel\nthis has happened in at least three of my repos on three distinct\nprojects:\n\napw@pinky$ git fetch origin\nremote: Generating pack...\nremote: Done counting 5 objects.\nremote: Deltifying 5 objects...\nremote:  100% (5/5) done\nUnpacking 5 objects...\nremote: Total 5 (delta 0), reused 0 (delta 0)\n 100% (5/5) done\n* refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n  old..new: ce046f0..41c9dde\n* refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n  old..new: ce046f0..41c9dde\nerror: Ref refs/remotes/origin/master is at 41c9dde2e63f35cd7c64b0a52c3650f246999ffd but expected ce046f04172a2a216092936302ab2cb4da64b69e\napw@pinky$\n\nThis is with a 'next' a couple of days old:\n\napw@pinky$ git --version\ngit version 1.5.3.3.1145.g46930-dirty\napw@pinky$\n\nWill be upgrading to the latest next, will let you know if I see it again.\n\n-apw\n"},{"id":"55064","messageId":"Pine.LNX.4.64.0710071728570.4174@racer.site","threadId":"10172","inReplyTo":"20071006185759.GE28610@shadowen.org","subject":"Re: git fetch -- double fetch","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-10-07T16:29:38Z","receivedAt":"2007-10-07T16:29:38Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 6 Oct 2007, Andy Whitcroft wrote:\n\n> I have recently been seeing repeated fetching of some branches.  I feel\n> this has happened in at least three of my repos on three distinct\n> projects:\n> \n> apw@pinky$ git fetch origin\n> remote: Generating pack...\n> remote: Done counting 5 objects.\n> remote: Deltifying 5 objects...\n> remote:  100% (5/5) done\n> Unpacking 5 objects...\n> remote: Total 5 (delta 0), reused 0 (delta 0)\n>  100% (5/5) done\n> * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n>   old..new: ce046f0..41c9dde\n> * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n>   old..new: ce046f0..41c9dde\n\nWhat does \"git config --get-all remote.origin.fetch\" say?\n\nCiao,\nDscho\n"},{"id":"55093","messageId":"20071007214433.GA30833@shadowen.org","threadId":"10172","inReplyTo":"Pine.LNX.4.64.0710071728570.4174@racer.site","subject":"Re: git fetch -- double fetch","fromName":"Andy Whitcroft","fromEmail":"apw@shadowen.org","sentAt":"2007-10-07T21:44:33Z","receivedAt":"2007-10-07T21:44:33Z","isPatch":false,"sender":{"key":"apw@shadowen.org","avatar":"https://gravatar.com/avatar/d3088262854661a913ef35cc40fedcc270142d4461791142bc1ea0b2a4e2e147?d=mp&s=160"},"body":"On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote:\n> Hi,\n> \n> On Sat, 6 Oct 2007, Andy Whitcroft wrote:\n> \n> > I have recently been seeing repeated fetching of some branches.  I feel\n> > this has happened in at least three of my repos on three distinct\n> > projects:\n> > \n> > apw@pinky$ git fetch origin\n> > remote: Generating pack...\n> > remote: Done counting 5 objects.\n> > remote: Deltifying 5 objects...\n> > remote:  100% (5/5) done\n> > Unpacking 5 objects...\n> > remote: Total 5 (delta 0), reused 0 (delta 0)\n> >  100% (5/5) done\n> > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n> >   old..new: ce046f0..41c9dde\n> > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n> >   old..new: ce046f0..41c9dde\n> \n> What does \"git config --get-all remote.origin.fetch\" say?\n\napw@pinky$ git config --get-all remote.origin.fetch\n+refs/heads/master:refs/remotes/origin/master\n+refs/heads/*:refs/remotes/origin/*\napw@pinky$\n\nI don't think that I did anything to this config, I think that is what\nthe clone setup for me.\n\n-apw\n"},{"id":"55107","messageId":"Pine.LNX.4.64.0710071903150.23070@iabervon.org","threadId":"10172","inReplyTo":"20071007214433.GA30833@shadowen.org","subject":"Re: git fetch -- double fetch","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2007-10-07T23:14:28Z","receivedAt":"2007-10-07T23:14:28Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Sun, 7 Oct 2007, Andy Whitcroft wrote:\n\n> On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote:\n> > Hi,\n> > \n> > On Sat, 6 Oct 2007, Andy Whitcroft wrote:\n> > \n> > > I have recently been seeing repeated fetching of some branches.  I feel\n> > > this has happened in at least three of my repos on three distinct\n> > > projects:\n> > > \n> > > apw@pinky$ git fetch origin\n> > > remote: Generating pack...\n> > > remote: Done counting 5 objects.\n> > > remote: Deltifying 5 objects...\n> > > remote:  100% (5/5) done\n> > > Unpacking 5 objects...\n> > > remote: Total 5 (delta 0), reused 0 (delta 0)\n> > >  100% (5/5) done\n> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n> > >   old..new: ce046f0..41c9dde\n> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n> > >   old..new: ce046f0..41c9dde\n> > \n> > What does \"git config --get-all remote.origin.fetch\" say?\n> \n> apw@pinky$ git config --get-all remote.origin.fetch\n> +refs/heads/master:refs/remotes/origin/master\n> +refs/heads/*:refs/remotes/origin/*\n> apw@pinky$\n> \n> I don't think that I did anything to this config, I think that is what\n> the clone setup for me.\n\nAh, both the first line and the pattern match, and there's nothing at that \nstage to filter out duplicates.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"},{"id":"55125","messageId":"Pine.LNX.4.64.0710080022300.4174@racer.site","threadId":"10172","inReplyTo":"20071007214433.GA30833@shadowen.org","subject":"Re: git fetch -- double fetch","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-10-07T23:25:26Z","receivedAt":"2007-10-07T23:25:26Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 7 Oct 2007, Andy Whitcroft wrote:\n\n> On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote:\n>\n> > On Sat, 6 Oct 2007, Andy Whitcroft wrote:\n> > \n> > > I have recently been seeing repeated fetching of some branches.  I \n> > > feel this has happened in at least three of my repos on three \n> > > distinct projects:\n> > > \n> > > apw@pinky$ git fetch origin\n> > > remote: Generating pack...\n> > > remote: Done counting 5 objects.\n> > > remote: Deltifying 5 objects...\n> > > remote:  100% (5/5) done\n> > > Unpacking 5 objects...\n> > > remote: Total 5 (delta 0), reused 0 (delta 0)\n> > >  100% (5/5) done\n> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n> > >   old..new: ce046f0..41c9dde\n> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat\n> > >   old..new: ce046f0..41c9dde\n> > \n> > What does \"git config --get-all remote.origin.fetch\" say?\n> \n> apw@pinky$ git config --get-all remote.origin.fetch\n> +refs/heads/master:refs/remotes/origin/master\n> +refs/heads/*:refs/remotes/origin/*\n> apw@pinky$\n> \n> I don't think that I did anything to this config, I think that is what \n> the clone setup for me.\n\nActually, I am quite certain that git clone does not produce the first \nline; But I think that it was necessary to put in some line like that in \nolder git, where the first ref was the one being merged by a pull.\n\nBut as I suspected, and Daniel replied, too, your issue is that both lines \nmatch \"master\".\n\nYou might want to delete the first line, and use \"branch.<name>.remote\" \nand \"branch.<name>.merge\" to force pull to merge \"master\" instead.\n\nIn the long run, it might be a good idea to cull duplicates in git-fetch, \nbut for the moment I have enough other stuff to do ;-)\n\nCiao,\nDscho\n"}]}