From 13e7ed6a3a0ecd5d50b7bba2d86ce9d88494fa9b Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 16 Mar 2020 18:05:04 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- merge.c | 1 + 1 file changed, 1 insertion(+) (limited to 'merge.c') diff --git a/merge.c b/merge.c index 7c1d756c3f..aa36de2f64 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)) { -- cgit v1.2.3