The second batch post 2.26 cycle

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index c37515ee312aaf0f04cc5cb20dbc41438bd5971c..6fd2674632bb2a524e22536e22658dbb3d06d6c3 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -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);