From: Junio C Hamano <gitster@pobox.com>
To: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, phillip.wood123@gmail.com,
Johannes.Schindelin@gmx.de, bturner@atlassian.com,
sami@boukortt.com, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v2 0/3] rebase -i: mark commits that begin empty in todo editor
Date: Fri, 10 Apr 2020 14:14:21 -0700 [thread overview]
Message-ID: <xmqqh7xrhwlu.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqlfn3hx1v.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Fri, 10 Apr 2020 14:04:44 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> This is a total tangent, but when I tried to rebase
> jt/rebase-allow-duplicate that builds directly on top of v2.25.0 to
> a newer base, after resolving conflicts, "commit -a" and "rebase
> --continue", somewhere I seem to have mangled the authorship. It
> could entirely be a driver error, or it may be a bug in "rebase",
> especially with recent backend change. I am planning to come back
> to it later to figure out if there is such a bug, but I'd need to
> recover from the authorship screwup first, so it may take some
> time.
I think I know how it happens now.
52e8d1942c662 == jt/rebase-allow-duplicate
Attempting to rebase this on top of the 'master', i.e.
$ git rebase --onto master 52e8d1942c662^ 52e8d1942c662
results in a merge conflict, but it is easy to resolve in the
working tree. Then after "git add -u" to record the resolution
in the index
$ git commit
$ git rebase --continue
gives me the authorship credit.
Back when the default rebase backend was 'apply', making the above
"mistake" was not even possible; "git commit" would have given me an
empty log buffer to edit, without pre-filling anything, to help me
realize that I shouldn't commit.
With the sequencer backend, however, the above procedure happily
records the commit under the author's name, it seems.
I am not sure if that is a bug. I am inclined to say so.
next prev parent reply other threads:[~2020-04-10 21:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 23:26 [PATCH] rebase -i: mark commits that begin empty in todo editor Elijah Newren via GitGitGadget
2020-04-10 0:50 ` Junio C Hamano
2020-04-10 2:06 ` Bryan Turner
2020-04-10 4:57 ` Junio C Hamano
2020-04-10 17:51 ` [PATCH v2 0/3] " Elijah Newren via GitGitGadget
2020-04-10 17:51 ` [PATCH v2 1/3] " Elijah Newren via GitGitGadget
2020-04-10 17:51 ` [PATCH v2 2/3] rebase: reinstate --no-keep-empty Elijah Newren via GitGitGadget
2020-04-10 20:37 ` Junio C Hamano
2020-04-10 21:41 ` Elijah Newren
2020-04-10 17:51 ` [PATCH v2 3/3] rebase: fix an incompatible-options error message Elijah Newren via GitGitGadget
2020-04-10 20:42 ` [PATCH v2 0/3] rebase -i: mark commits that begin empty in todo editor Junio C Hamano
2020-04-10 21:04 ` Junio C Hamano
2020-04-10 21:14 ` Junio C Hamano [this message]
2020-04-10 22:11 ` Elijah Newren
2020-04-10 21:29 ` Junio C Hamano
2020-04-10 22:13 ` Elijah Newren
2020-04-10 22:30 ` Junio C Hamano
2020-04-11 0:07 ` Elijah Newren
2020-04-11 21:14 ` Junio C Hamano
2020-04-11 2:44 ` [PATCH v3 0/4] " Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 1/4] " Elijah Newren via GitGitGadget
2020-04-15 20:52 ` Junio C Hamano
2020-04-11 2:44 ` [PATCH v3 2/4] rebase: reinstate --no-keep-empty Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 3/4] rebase: fix an incompatible-options error message Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 4/4] rebase --merge: optionally skip upstreamed commits Jonathan Tan via GitGitGadget
2020-04-11 18:12 ` Jonathan Tan
2020-04-14 9:11 ` [PATCH v3 0/4] rebase -i: mark commits that begin empty in todo editor Phillip Wood
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=xmqqh7xrhwlu.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=sami@boukortt.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.