From: Elijah Newren <newren@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Norbert Kiesel <nkiesel@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] pull: avoid running both merge and rebase
Date: Sat, 28 Mar 2020 10:18:07 -0700 [thread overview]
Message-ID: <CABPp-BFgwcGjvwFsHzgf8bvR6dY2EocpUbn5-on5sdeRqkw1jw@mail.gmail.com> (raw)
In-Reply-To: <20200328155627.GB1215566@coredump.intra.peff.net>
On Sat, Mar 28, 2020 at 8:56 AM Jeff King <peff@peff.net> wrote:
>
> On Fri, Mar 27, 2020 at 09:51:40PM +0000, Elijah Newren via GitGitGadget wrote:
>
> > When opt_rebase is true, we still first check if we can fast-forward.
> > If the branch is fast-forwardable, then we can avoid the rebase and just
> > use merge to do the fast-forward logic. However, when commit a6d7eb2c7a
> > ("pull: optionally rebase submodules (remote submodule changes only)",
> > 2017-06-23) added the ability to rebase submodules it accidentally
> > caused us to run BOTH a merge and a rebase. Add a flag to avoid doing
> > both.
> >
> > This was found when a user had both pull.rebase and rebase.autosquash
> > set to true. In such a case, the running of both merge and rebase would
> > cause ORIG_HEAD to be updated twice (and match HEAD at the end instead
> > of the commit before the rebase started), against expectation.
> >
> > Signed-off-by: Elijah Newren <newren@gmail.com>
> > ---
> > pull: avoid running both merge and rebase
> >
> > Cc: Norbert Kiesel nkiesel@gmail.com [nkiesel@gmail.com], Jeff King
> > peff@peff.net [peff@peff.net]
>
> I'm not sure how cc is supposed to work with GGG, but it clearly didn't
> here. :)
Yeah, I clearly don't either. I even looked up another submission
from Dscho (https://github.com/git/git/pull/728) and attempted to
mimic it, but still managed to get it wrong somehow and I don't know
how.
> Anyway, the patch looks good. Thanks for following through on this.
>
> > @@ -992,10 +993,12 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
> > if (is_descendant_of(merge_head, list)) {
> > /* we can fast-forward this without invoking rebase */
> > opt_ff = "--ff-only";
> > + ran_ff = 1;
> > ret = run_merge();
> > }
> > }
> > - ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
> > + if (!ran_ff)
> > + ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
>
> It feels like there should be some arrangement of the conditionals that
> doesn't require setting an extra flag, but I actually don't think there
> is. And anyway, doing the most obvious and minimal fix here is the right
> place to start. We don't need more regressions. ;)
Thanks for reviewing it.
next prev parent reply other threads:[~2020-03-28 17:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 21:51 [PATCH] pull: avoid running both merge and rebase Elijah Newren via GitGitGadget
2020-03-27 22:54 ` Junio C Hamano
2020-03-28 15:56 ` Jeff King
2020-03-28 16:55 ` Derrick Stolee
2020-03-28 17:17 ` Elijah Newren
2020-03-28 17:18 ` Elijah Newren [this message]
2020-04-04 13:47 ` GGG Cc: bug, was " Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BFgwcGjvwFsHzgf8bvR6dY2EocpUbn5-on5sdeRqkw1jw@mail.gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=nkiesel@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).