builtin/rebase: compute checkout metadata for rebases

Signed-off-by: brian m. carlson <bk2204@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-03-16 18:05:06 +00:00
parent dfc8cdc677
commit 3f26785624
3 changed files with 40 additions and 1 deletions
--- 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);