From: Christopher Tiwald <christiwald@gmail.com>
Date: Tue, 24 Apr 2012 12:21:49 GMT
Subject: Re: [PATCH] Give better 'pull' advice when pushing non-ff updates to current branch
Message-ID: <20120424122149.GB41274@gmail.com>
In-Reply-To: <vpqipgpehlk.fsf@bauges.imag.fr>

On Tue, Apr 24, 2012 at 09:04:07AM +0200, Matthieu Moy wrote:
> > +		if (branch->remote_name &&
> > +		    branch->merge &&
> > +		    branch->merge_nr == 1 &&
> > +		    !strcmp(transport->remote->name, branch->remote_name) &&
> > +		    !strcmp(strbuf_detach(&buf, NULL),
> > +			    prettify_refname(branch->merge[0]->dst))) {
> > +			advise_tracked_pull_before_push();
> > +		}
> > +		else
> > +			advise_untracked_pull_before_push();
> 
> Isn't this doing the opposite of what the comment is saying about
> octopus merge, i.e. if branch->merge_nr > 1, call
> advise_untracked_pull_before_push() which will advise 'git pull <remote>
> <branch>'?

Ah yes. The logic is wrong for the octopus case. That's easy to fix, but
I'm considering ditching the matching entirely per my response to
Junio's concerns. I think it might do more harm then good.

--
Christopher Tiwald