diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-12 14:28:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-12 14:28:01 -0700 |
| commit | b4f0038525623e0e5aa3b35d520de909618cae98 (patch) | |
| tree | 5f4056c2fed1880f4faddb834691ebda724bbf0e /sequencer.c | |
| parent | Merge branch 'ds/sparse-add' (diff) | |
| parent | git-rebase.txt: highlight backend differences with commit rewording (diff) | |
| download | tgif-b4f0038525623e0e5aa3b35d520de909618cae98.tar.xz | |
Merge branch 'en/rebase-backend'
Band-aid fixes for two fallouts from switching the default "rebase"
backend.
* en/rebase-backend:
git-rebase.txt: highlight backend differences with commit rewording
sequencer: clear state upon dropping a become-empty commit
i18n: unmark a message in rebase.c
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index 7477b15422..e528225e78 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1957,6 +1957,8 @@ static int do_pick_commit(struct repository *r, flags |= ALLOW_EMPTY; } else if (allow == 2) { drop_commit = 1; + unlink(git_path_cherry_pick_head(r)); + unlink(git_path_merge_msg(r)); fprintf(stderr, _("dropping %s %s -- patch contents already upstream\n"), oid_to_hex(&commit->object.oid), msg.subject); |