* git fetch -- double fetch @ 2007-10-06 18:57 Andy Whitcroft 2007-10-07 16:29 ` Johannes Schindelin 0 siblings, 1 reply; 5+ messages in thread From: Andy Whitcroft @ 2007-10-06 18:57 UTC (permalink / raw) To: git I have recently been seeing repeated fetching of some branches. I feel this has happened in at least three of my repos on three distinct projects: apw@pinky$ git fetch origin remote: Generating pack... remote: Done counting 5 objects. remote: Deltifying 5 objects... remote: 100% (5/5) done Unpacking 5 objects... remote: Total 5 (delta 0), reused 0 (delta 0) 100% (5/5) done * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat old..new: ce046f0..41c9dde * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat old..new: ce046f0..41c9dde error: Ref refs/remotes/origin/master is at 41c9dde2e63f35cd7c64b0a52c3650f246999ffd but expected ce046f04172a2a216092936302ab2cb4da64b69e apw@pinky$ This is with a 'next' a couple of days old: apw@pinky$ git --version git version 1.5.3.3.1145.g46930-dirty apw@pinky$ Will be upgrading to the latest next, will let you know if I see it again. -apw ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git fetch -- double fetch 2007-10-06 18:57 git fetch -- double fetch Andy Whitcroft @ 2007-10-07 16:29 ` Johannes Schindelin 2007-10-07 21:44 ` Andy Whitcroft 0 siblings, 1 reply; 5+ messages in thread From: Johannes Schindelin @ 2007-10-07 16:29 UTC (permalink / raw) To: Andy Whitcroft; +Cc: git Hi, On Sat, 6 Oct 2007, Andy Whitcroft wrote: > I have recently been seeing repeated fetching of some branches. I feel > this has happened in at least three of my repos on three distinct > projects: > > apw@pinky$ git fetch origin > remote: Generating pack... > remote: Done counting 5 objects. > remote: Deltifying 5 objects... > remote: 100% (5/5) done > Unpacking 5 objects... > remote: Total 5 (delta 0), reused 0 (delta 0) > 100% (5/5) done > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > old..new: ce046f0..41c9dde > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > old..new: ce046f0..41c9dde What does "git config --get-all remote.origin.fetch" say? Ciao, Dscho ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git fetch -- double fetch 2007-10-07 16:29 ` Johannes Schindelin @ 2007-10-07 21:44 ` Andy Whitcroft 2007-10-07 23:14 ` Daniel Barkalow 2007-10-07 23:25 ` Johannes Schindelin 0 siblings, 2 replies; 5+ messages in thread From: Andy Whitcroft @ 2007-10-07 21:44 UTC (permalink / raw) To: Johannes Schindelin; +Cc: git On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote: > Hi, > > On Sat, 6 Oct 2007, Andy Whitcroft wrote: > > > I have recently been seeing repeated fetching of some branches. I feel > > this has happened in at least three of my repos on three distinct > > projects: > > > > apw@pinky$ git fetch origin > > remote: Generating pack... > > remote: Done counting 5 objects. > > remote: Deltifying 5 objects... > > remote: 100% (5/5) done > > Unpacking 5 objects... > > remote: Total 5 (delta 0), reused 0 (delta 0) > > 100% (5/5) done > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > > old..new: ce046f0..41c9dde > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > > old..new: ce046f0..41c9dde > > What does "git config --get-all remote.origin.fetch" say? apw@pinky$ git config --get-all remote.origin.fetch +refs/heads/master:refs/remotes/origin/master +refs/heads/*:refs/remotes/origin/* apw@pinky$ I don't think that I did anything to this config, I think that is what the clone setup for me. -apw ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git fetch -- double fetch 2007-10-07 21:44 ` Andy Whitcroft @ 2007-10-07 23:14 ` Daniel Barkalow 2007-10-07 23:25 ` Johannes Schindelin 1 sibling, 0 replies; 5+ messages in thread From: Daniel Barkalow @ 2007-10-07 23:14 UTC (permalink / raw) To: Andy Whitcroft; +Cc: Johannes Schindelin, git On Sun, 7 Oct 2007, Andy Whitcroft wrote: > On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote: > > Hi, > > > > On Sat, 6 Oct 2007, Andy Whitcroft wrote: > > > > > I have recently been seeing repeated fetching of some branches. I feel > > > this has happened in at least three of my repos on three distinct > > > projects: > > > > > > apw@pinky$ git fetch origin > > > remote: Generating pack... > > > remote: Done counting 5 objects. > > > remote: Deltifying 5 objects... > > > remote: 100% (5/5) done > > > Unpacking 5 objects... > > > remote: Total 5 (delta 0), reused 0 (delta 0) > > > 100% (5/5) done > > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > > > old..new: ce046f0..41c9dde > > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > > > old..new: ce046f0..41c9dde > > > > What does "git config --get-all remote.origin.fetch" say? > > apw@pinky$ git config --get-all remote.origin.fetch > +refs/heads/master:refs/remotes/origin/master > +refs/heads/*:refs/remotes/origin/* > apw@pinky$ > > I don't think that I did anything to this config, I think that is what > the clone setup for me. Ah, both the first line and the pattern match, and there's nothing at that stage to filter out duplicates. -Daniel *This .sig left intentionally blank* ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git fetch -- double fetch 2007-10-07 21:44 ` Andy Whitcroft 2007-10-07 23:14 ` Daniel Barkalow @ 2007-10-07 23:25 ` Johannes Schindelin 1 sibling, 0 replies; 5+ messages in thread From: Johannes Schindelin @ 2007-10-07 23:25 UTC (permalink / raw) To: Andy Whitcroft; +Cc: git Hi, On Sun, 7 Oct 2007, Andy Whitcroft wrote: > On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote: > > > On Sat, 6 Oct 2007, Andy Whitcroft wrote: > > > > > I have recently been seeing repeated fetching of some branches. I > > > feel this has happened in at least three of my repos on three > > > distinct projects: > > > > > > apw@pinky$ git fetch origin > > > remote: Generating pack... > > > remote: Done counting 5 objects. > > > remote: Deltifying 5 objects... > > > remote: 100% (5/5) done > > > Unpacking 5 objects... > > > remote: Total 5 (delta 0), reused 0 (delta 0) > > > 100% (5/5) done > > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > > > old..new: ce046f0..41c9dde > > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat > > > old..new: ce046f0..41c9dde > > > > What does "git config --get-all remote.origin.fetch" say? > > apw@pinky$ git config --get-all remote.origin.fetch > +refs/heads/master:refs/remotes/origin/master > +refs/heads/*:refs/remotes/origin/* > apw@pinky$ > > I don't think that I did anything to this config, I think that is what > the clone setup for me. Actually, I am quite certain that git clone does not produce the first line; But I think that it was necessary to put in some line like that in older git, where the first ref was the one being merged by a pull. But as I suspected, and Daniel replied, too, your issue is that both lines match "master". You might want to delete the first line, and use "branch.<name>.remote" and "branch.<name>.merge" to force pull to merge "master" instead. In the long run, it might be a good idea to cull duplicates in git-fetch, but for the moment I have enough other stuff to do ;-) Ciao, Dscho ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-10-07 23:26 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-10-06 18:57 git fetch -- double fetch Andy Whitcroft 2007-10-07 16:29 ` Johannes Schindelin 2007-10-07 21:44 ` Andy Whitcroft 2007-10-07 23:14 ` Daniel Barkalow 2007-10-07 23:25 ` Johannes Schindelin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).