summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorbrian m. carlson <bk2204@github.com>2020-03-16 18:05:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-16 18:37:02 (GMT)
commit3f267856243693676c04b4d6dfa1e22de62e407a (patch)
tree67dcfa20f2fcd3f7a06f9db0a2763d967328fca2 /sequencer.c
parentdfc8cdc6772a05db4ed64c45df3fe2defdae7eb3 (diff)
downloadgit-3f267856243693676c04b4d6dfa1e22de62e407a.zip
git-3f267856243693676c04b4d6dfa1e22de62e407a.tar.gz
git-3f267856243693676c04b4d6dfa1e22de62e407a.tar.bz2
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>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c
index 7477b15..b05a010 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);