git fetch -- double fetch
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
Hi,
Quoted 4 lines · Andy Whitcroft
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:
Quoted 12 lines
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
Quoted 21 lines · Johannes Schindelin
Hi,
Quoted 4 lines · Andy Whitcroft
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:
Quoted 12 lines
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
Quoted 1 line
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
Quoted 29 lines · Andy Whitcroft
Quoted 21 lines · Johannes Schindelin
Hi,
Quoted 4 lines · Andy Whitcroft
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:
Quoted 12 lines
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..41c9ddeQuoted 1 line
What does "git config --get-all remote.origin.fetch" say?
apw@pinky$ git config --get-all remote.origin.fetch(quoted diff) +2
-0+refs/heads/master:refs/remotes/origin/master +refs/heads/*:refs/remotes/origin/*apw@pinky$
Quoted 2 lines
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*
Hi,
Quoted 28 lines · Andy Whitcroft
Quoted 19 lines · Johannes Schindelin
Quoted 4 lines · Andy Whitcroft
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:
Quoted 12 lines
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..41c9ddeQuoted 1 line
What does "git config --get-all remote.origin.fetch" say?
apw@pinky$ git config --get-all remote.origin.fetch(quoted diff) +2
-0+refs/heads/master:refs/remotes/origin/master +refs/heads/*:refs/remotes/origin/*apw@pinky$
Quoted 2 lines
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