From: Jeff King <peff@peff.net>
To: Bill Lear <rael@zopyra.com>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: Dangers of working on a tracking branch
Date: Fri, 16 Feb 2007 10:21:30 -0500 [thread overview]
Message-ID: <20070216152130.GA7086@coredump.intra.peff.net> (raw)
In-Reply-To: <17877.51730.418633.750922@lisa.zopyra.com>
On Fri, Feb 16, 2007 at 09:13:22AM -0600, Bill Lear wrote:
> % git pull ../peer_repo topic:topic
> [...]
> * refs/heads/topic: not updating to non-fast forward branch 'topic' of ../peer_repo
> [...]
> So, why does it say "not updating to non-fast forward branch", yet
> it does the merge and gets the changes anyway?
Because your pull command really means "merge in the topic branch from
peer_repo, and while you're at it, store it in my local tracking branch
topic". Remember that pull is really a fetch+merge. But the fetch is
actually doing _two_ things: putting the fetched branch into FETCH_HEAD,
and putting it in into refs/heads/topic. The latter fails (because of a
non-fastforward), but pull actually uses the FETCH_HEAD results to
do the merge.
Yes, this seems overly complex for what you're doing, but the reason for
FETCH_HEAD is to support pulls when you _don't_ have a tracking branch
at all (i.e., 'git pull ../peer_repo topic').
-Peff
next prev parent reply other threads:[~2007-02-16 15:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-15 20:49 Dangers of working on a tracking branch Bill Lear
2007-02-15 21:00 ` Nicolas Pitre
2007-02-15 21:21 ` Bill Lear
2007-02-15 21:33 ` Bill Lear
2007-02-15 21:43 ` Jeff King
2007-02-15 21:53 ` Bill Lear
2007-02-15 21:58 ` Jeff King
2007-02-15 22:04 ` Bill Lear
2007-02-15 22:09 ` Shawn O. Pearce
2007-02-15 22:40 ` Bill Lear
2007-02-15 22:49 ` Shawn O. Pearce
2007-02-15 22:06 ` Jeff King
2007-02-15 22:30 ` Bill Lear
2007-02-16 2:00 ` Jakub Narebski
2007-02-16 15:13 ` Bill Lear
2007-02-16 15:21 ` Jeff King [this message]
2007-02-16 15:27 ` Bill Lear
2007-02-16 15:52 ` Jeff King
2007-02-16 16:10 ` Santi Béjar
2007-02-16 16:34 ` Nicolas Pitre
2007-02-16 16:40 ` Bill Lear
2007-02-15 22:14 ` Nicolas Pitre
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=20070216152130.GA7086@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=rael@zopyra.com \
/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).