From: Elijah Newren <newren@gmail.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Jeff King <peff@peff.net>,
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Norbert Kiesel <nkiesel@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] pull: avoid running both merge and rebase
Date: Sat, 28 Mar 2020 10:17:31 -0700 [thread overview]
Message-ID: <CABPp-BHLtyCR_2KC6M=GaiJTOAR90wHTLAM4twEq_p4JaKrm3g@mail.gmail.com> (raw)
In-Reply-To: <afb593c8-ba46-fe8f-8853-d0b727186af0@gmail.com>
On Sat, Mar 28, 2020 at 9:55 AM Derrick Stolee <stolee@gmail.com> wrote:
>
> On 3/28/2020 11:56 AM, Jeff King 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. :)
>
> Angle brackets would work instead of square brackets:
>
> Cc: Norbert Keisel <nkiesel@gmail.com>
>
> for example. Personally, I drop the names and only use email addresses
> so I don't make this same mistake.
My original did have angle brackets; it was literally the following line:
Cc: Norbert Kiesel <nkiesel@gmail.com>, Jeff King <peff@peff.net>
Not sure why it came through with duplicated email addresses with one
inside of square brackets. Maybe GitHub markup does something to the
angle brackets, and GGG doesn't get the original text but the
markdown-interpreted clobbering thereof? Or something like that?
next prev parent reply other threads:[~2020-03-28 17:17 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 [this message]
2020-03-28 17:18 ` Elijah Newren
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BHLtyCR_2KC6M=GaiJTOAR90wHTLAM4twEq_p4JaKrm3g@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=nkiesel@gmail.com \
--cc=peff@peff.net \
--cc=stolee@gmail.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).