Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index d2257e0d82..4dbcab3727 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -230,7 +230,7 @@ static int checkout_merged(int pos, const struct checkout *state)
if (write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid))
die(_("Unable to add merge result for '%s'"), path);
free(result_buf.ptr);
- ce = make_index_entry(&the_index, mode, oid.hash, path, 2, 0);
+ ce = make_index_entry(state->istate, mode, oid.hash, path, 2, 0);
if (!ce)
die(_("make_index_entry failed for path '%s'"), path);
status = checkout_entry(ce, state, NULL);
--
2.18.0.rc0.333.g22e6ee6cdf
