summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorbrian m. carlson <bk2204@github.com>2020-03-16 18:05:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-16 18:37:02 (GMT)
commit13e7ed6a3a0ecd5d50b7bba2d86ce9d88494fa9b (patch)
treed2c5b1215ca578250aa88dbbeee45310ceb2e3d0 /merge.c
parentc397aac02f9f97976f675115aa5df6ca01e26d59 (diff)
downloadgit-13e7ed6a3a0ecd5d50b7bba2d86ce9d88494fa9b.zip
git-13e7ed6a3a0ecd5d50b7bba2d86ce9d88494fa9b.tar.gz
git-13e7ed6a3a0ecd5d50b7bba2d86ce9d88494fa9b.tar.bz2
builtin/checkout: compute checkout metadata for checkouts
Provide commit metadata for checkout code paths that use unpack_trees and friends. When we're checking out a commit, use the commit information, but don't provide commit information if we're checking out from the index, since there need not be any particular commit associated with the index, and even if there is one, we can't know what it is. Signed-off-by: brian m. carlson <bk2204@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/merge.c b/merge.c
index 7c1d756..aa36de2 100644
--- a/merge.c
+++ b/merge.c
@@ -94,6 +94,7 @@ int checkout_fast_forward(struct repository *r,
opts.verbose_update = 1;
opts.merge = 1;
opts.fn = twoway_merge;
+ init_checkout_metadata(&opts.meta, NULL, remote, NULL);
setup_unpack_trees_porcelain(&opts, "merge");
if (unpack_trees(nr_trees, t, &opts)) {