On 5/16/07, Martin Langhoff <martin.langhoff@xxxxxxxxx> wrote:
I'm probably in a bad-communication day :-/
Ok - I just repro'd the problem -- maybe this helps clarify... I have a checkout of http://git.catalyst.net.nz/git/moodle-r2.git ( see http://git.catalyst.net.nz/gitweb ) where I have the following tracking branches: $ git branch mdl17-polhn * mdl18-local I know that I am "all pushed out" - no local commits to push here. So I start my day and do $ git-pull # brings some commits, but nothing to mdl18-local $ git-merge origin/MOODLE_18_STABLE # messy merge from the upstream branch I track... $ git-commit $ git-push $ git-push updating 'refs/heads/mdl18-local' from f3f1ae5c9f73fe6e0872dfe0e072521b6fe26463 to 3af93dafbd9162423e5f0a720d4d2081313789e2 updating 'refs/remotes/origin/MOODLE_18_STABLE' from 52abd5d7c4f0ac54cfc0463d5276c159a02a76c0 to 4cfaa3c85ee54ec8c0891157a6becdd8db34eb52 updating 'refs/remotes/origin/cvshead' from 7bf579b243717c470770b1457a7d1c50f6a8dff6 to e835361626c5cd27cabdc046fc0e23a2c6ff98db updating 'refs/remotes/origin/mdl18-ldc' from eb91f220ccbbeb1e8b43496d0172e6cd1b6549ea to af4c6ee952057d11b2dbf55103a5c3134640b70f updating 'refs/remotes/origin/mdl18-topnz' from a08fdb4decfa7b92c3030801c08378ee629c038d to 347bc44adbfdf7b800334cbb532d436fa73e87ac (removed some tag-related noise) Generating pack... Done counting 212 objects. Result has 72 objects. Deltifying 72 objects... 100% (72/72) done Writing 72 objects... Unpacking 72 objects 100% (72/72) done Total 72 (delta 65), reused 0 (delta 0) refs/heads/mdl18-local: f3f1ae5c9f73fe6e0872dfe0e072521b6fe26463 -> 3af93dafbd9162423e5f0a720d4d2081313789e2 refs/remotes/origin/MOODLE_18_STABLE: 52abd5d7c4f0ac54cfc0463d5276c159a02a76c0 -> 4cfaa3c85ee54ec8c0891157a6becdd8db34eb52 refs/remotes/origin/cvshead: 7bf579b243717c470770b1457a7d1c50f6a8dff6 -> e835361626c5cd27cabdc046fc0e23a2c6ff98db refs/remotes/origin/mdl18-ldc: eb91f220ccbbeb1e8b43496d0172e6cd1b6549ea -> af4c6ee952057d11b2dbf55103a5c3134640b70f refs/remotes/origin/mdl18-topnz: a08fdb4decfa7b92c3030801c08378ee629c038d -> 347bc44adbfdf7b800334cbb532d436fa73e87ac As you can see, it talks about updating lots of refs. Nonsense -- I think it's a bug. The only ref being updated is origin/mdl18-local on the remote repo, and it should update the local refs/remotes/origin/mdl18-local. cheers, m - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
