Re: Your branch and 'origin/master' have diverged

From: Jeff King <peff@peff.net>
Date: Aug 16, 2012, 16:21 UTC
Message-ID: <20120816162142.GC2853@sigill.intra.peff.net>
In-Reply-To: <87sjbo63pl.fsf@thomas.inf.ethz.ch>

On Wed, Aug 15, 2012 at 08:59:02AM +0200, Thomas Rast wrote:

Show 15 quoted lines

> I have never had a need for a fetch that doesn't update the remote
> namespace, nor heard anyone on IRC who has.  OTOH, I do have anecdotal
> evidence in support of "the current state is confusing": this thread, or
> the fact that Jan's IRC bot grew bot-quotes !fetch4/!pull4 that people
> use to warn users of 'git pull origin master' (it's apparently very
> common).
> 
> The 1.8.0 thread is here, and Peff even said he had a patch he uses in
> his tree:
> 
> http://thread.gmane.org/gmane.comp.version-control.git/165720/focus=165758
> 
> There's even a newer thread suggesting the same:
> 
> http://thread.gmane.org/gmane.comp.version-control.git/192252

Yeah, I have been running with that patch for ages, and it has never been a problem for me. Of course, the problem cases are very specific workflows that I do not happen to use. There are definitely regressions for some workflows; the question is whether or not anybody is using those workflows (and/or would be bothered to adapt to using the reflog instead).

Also note that there are several test failures with the patch, but I haven't investigated them (i.e., I don't know if the patch is buggy, if it is breaking a test in a way that is different than the expected regression, or if the test simply happens to depend on the current behavior and should be fixed).

-Peff