From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Victor Gambier <vgambier@excilys.com>,
Elijah Newren <newren@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 0/3] rebase --continue: remove .git/MERGE_MSG
Date: Tue, 10 Aug 2021 09:31:54 +0000 [thread overview]
Message-ID: <pull.1013.git.1628587917.gitgitgadget@gmail.com> (raw)
If the user removes all the changes from the worktree without running git
reset then it rebase --continue leaves behind .git/MERGE_MSG which will then
seed the message of the next commit. While working on this I noticed a
couple of fixups for the test files I was adding to, I've cc'd Elijah in
case my reasoning for patch 2 is off. Thanks to Victor for the bug report.
Phillip Wood (3):
t3403: fix commit authorship
rebase --apply: restore some tests
rebase --continue: remove .git/MERGE_MSG
sequencer.c | 3 +++
t/t3403-rebase-skip.sh | 13 +++++++++++--
t/t3418-rebase-continue.sh | 14 ++++++++++++--
3 files changed, 26 insertions(+), 4 deletions(-)
base-commit: 2d755dfac9aadab25c3e025b849252b8c0a61465
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1013%2Fphillipwood%2Fwip%2Frebase-remove-merge-msg-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1013/phillipwood/wip/rebase-remove-merge-msg-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1013
--
gitgitgadget
next reply other threads:[~2021-08-10 9:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 9:31 Phillip Wood via GitGitGadget [this message]
2021-08-10 9:31 ` [PATCH 1/3] t3403: fix commit authorship Phillip Wood via GitGitGadget
2021-08-10 17:01 ` Elijah Newren
2021-08-10 18:43 ` Junio C Hamano
2021-08-12 10:04 ` Phillip Wood
2021-08-14 21:53 ` Johannes Schindelin
2021-08-15 17:36 ` Junio C Hamano
2021-08-15 20:04 ` Phillip Wood
2021-08-16 16:36 ` Junio C Hamano
2021-08-17 10:05 ` Phillip Wood
2021-08-10 9:31 ` [PATCH 2/3] rebase --apply: restore some tests Phillip Wood via GitGitGadget
2021-08-10 16:58 ` Elijah Newren
2021-08-12 10:03 ` Phillip Wood
2021-08-10 9:31 ` [PATCH 3/3] rebase --continue: remove .git/MERGE_MSG Phillip Wood via GitGitGadget
2021-08-10 17:03 ` [PATCH 0/3] " Elijah Newren
2021-08-12 13:42 ` [PATCH v2 " Phillip Wood via GitGitGadget
2021-08-12 13:42 ` [PATCH v2 1/3] t3403: fix commit authorship Phillip Wood via GitGitGadget
2021-08-12 13:42 ` [PATCH v2 2/3] rebase --apply: restore some tests Phillip Wood via GitGitGadget
2021-08-12 13:42 ` [PATCH v2 3/3] rebase --continue: remove .git/MERGE_MSG Phillip Wood via GitGitGadget
2021-08-13 23:01 ` Junio C Hamano
2021-08-14 20:01 ` Phillip Wood
2021-08-13 0:46 ` [PATCH v2 0/3] " Elijah Newren
2021-08-13 15:31 ` Junio C Hamano
2021-08-13 17:21 ` Elijah Newren
2021-08-14 20:02 ` 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=pull.1013.git.1628587917.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=vgambier@excilys.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).