From: Christopher Tiwald <christiwald@gmail.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH] Give better 'pull' advice when pushing non-ff updates to current branch
Date: Tue, 24 Apr 2012 08:21:49 -0400 [thread overview]
Message-ID: <20120424122149.GB41274@gmail.com> (raw)
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
prev parent reply other threads:[~2012-04-24 12:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 22:45 [PATCH] Give better 'pull' advice when pushing non-ff updates to current branch Christopher Tiwald
2012-04-24 2:17 ` Junio C Hamano
2012-04-24 4:58 ` Christopher Tiwald
2012-04-24 19:06 ` Junio C Hamano
2012-04-24 2:29 ` Junio C Hamano
2012-04-24 7:04 ` Matthieu Moy
2012-04-24 12:21 ` Christopher Tiwald [this message]
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=20120424122149.GB41274@gmail.com \
--to=christiwald@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=peff@peff.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).