summaryrefslogtreecommitdiff
path: root/builtin
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 /builtin
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 'builtin')
-rw-r--r--builtin/rebase.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index cb7aeae..903267f 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -868,6 +868,7 @@ static int reset_head(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;