Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / reset.c

diff --git a/reset.c b/reset.c
index 79b683bffa77e7122849c3b7918042761d02f96a..2f4fbd07c54b59f71c92391a601d1ec9fe05ce7d 100644 (file)
--- a/reset.c
+++ b/reset.c
@@ -57,6 +57,7 @@ int reset_head(struct repository *r, struct object_id *oid, const char *action,
        unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
        unpack_tree_opts.update = 1;
        unpack_tree_opts.merge = 1;
+       init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
        if (!detach_head)
                unpack_tree_opts.reset = 1;