credential: correct order of parameters for credential_match

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 7477b15422a7a7e42e1406bd7ecf20b458a93658..e528225e787f4e26de604807efc798e8b967010e 100644 (file)
--- 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);