From 3f267856243693676c04b4d6dfa1e22de62e407a Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 16 Mar 2020 18:05:06 +0000 Subject: builtin/rebase: compute checkout metadata for rebases Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- sequencer.c | 1 + 1 file changed, 1 insertion(+) (limited to 'sequencer.c') diff --git a/sequencer.c b/sequencer.c index 7477b15422..b05a010c0c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3288,6 +3288,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); -- cgit v1.3