The second batch post 2.26 cycle

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 55b9e047ef3328d7b5f37a48137032e1c0334350..6fd2674632bb2a524e22536e22658dbb3d06d6c3 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1323,7 +1323,7 @@ static int try_to_commit(struct repository *r,
                return -1;
 
        if (flags & AMEND_MSG) {
-               const char *exclude_gpgsig[] = { "gpgsig", NULL };
+               const char *exclude_gpgsig[] = { "gpgsig", "gpgsig-sha256", NULL };
                const char *out_enc = get_commit_output_encoding();
                const char *message = logmsg_reencode(current_head, NULL,
                                                      out_enc);
@@ -3305,6 +3305,7 @@ static int do_reset(struct repository *r,
        unpack_tree_opts.fn = oneway_merge;
        unpack_tree_opts.merge = 1;
        unpack_tree_opts.update = 1;
+       init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL);
 
        if (repo_read_index_unmerged(r)) {
                rollback_lock_file(&lock);