From: "Martin Langhoff" <martin.langhoff@gmail.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: "Junio C Hamano" <junkio@cox.net>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: pull/push inconsistencies
Date: Thu, 17 May 2007 10:35:27 +1200 [thread overview]
Message-ID: <46a038f90705161535t6f15bbedy661accb54a9bd8c5@mail.gmail.com> (raw)
In-Reply-To: <46a038f90705151851i9027e01x993300b1b50d0285@mail.gmail.com>
On 5/16/07, Martin Langhoff <martin.langhoff@gmail.com> 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
next prev parent reply other threads:[~2007-05-16 22:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-15 22:53 pull/push inconsistencies Martin Langhoff
2007-05-15 23:21 ` Jakub Narebski
2007-05-16 0:24 ` Junio C Hamano
2007-05-16 1:11 ` Martin Langhoff
2007-05-16 1:22 ` Junio C Hamano
2007-05-16 1:40 ` J. Bruce Fields
2007-05-16 1:51 ` Martin Langhoff
2007-05-16 2:30 ` Junio C Hamano
2007-05-16 22:35 ` Martin Langhoff [this message]
2007-05-16 12:02 ` Jeff King
2007-05-16 2:50 ` [PATCH] " Daniel Barkalow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46a038f90705161535t6f15bbedy661accb54a9bd8c5@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=bfields@fieldses.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).