From: Nguyễn Thái Ngọc Duy Date: Wed, 06 Jun 2018 17:02:38 GMT Subject: [PATCH v4 18/23] apply.c: use the right index instead of the_index Message-ID: <20180606170243.4169-13-pclouds@gmail.com> In-Reply-To: <20180606170243.4169-1-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apply.c b/apply.c index fc42a0eadf..82f681972f 100644 --- a/apply.c +++ b/apply.c @@ -4090,7 +4090,7 @@ static int build_fake_ancestor(struct apply_state *state, struct patch *list) return error(_("sha1 information is lacking or useless " "(%s)."), name); - ce = make_index_entry(&the_index, patch->old_mode, oid.hash, name, 0, 0); + ce = make_index_entry(&result, patch->old_mode, oid.hash, name, 0, 0); if (!ce) return error(_("make_index_entry failed for path '%s'"), name); -- 2.18.0.rc0.333.g22e6ee6cdf