Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> --- builtin/difftool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/difftool.c b/builtin/difftool.c index fb2ccfe6f0..c7d6296762 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -321,7 +321,7 @@ static int checkout_path(unsigned mode, struct object_id *oid, struct cache_entry *ce; int ret; - ce = make_index_entry(&the_index, mode, oid->hash, path, 0, 0); + ce = make_index_entry(state->istate, mode, oid->hash, path, 0, 0); ret = checkout_entry(ce, state, NULL); free(ce); @@ -488,7 +488,7 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, * index. */ struct cache_entry *ce2 = - make_index_entry(&the_index, rmode, roid.hash, + make_index_entry(&wtindex, rmode, roid.hash, dst_path, 0, 0); add_index_entry(&wtindex, ce2, -- 2.18.0.rc0.333.g22e6ee6cdf
