[PATCH 20/24] resolve-undo.c: use the right index instead of the_index
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2018-08-13 16:15:46
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- resolve-undo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/resolve-undo.c b/resolve-undo.c
index d2e2d22b7f..236320f179 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c@@ -188,7 +188,7 @@ void unmerge_index(struct index_state *istate, const struct pathspec *pathspec) for (i = 0; i < istate->cache_nr; i++) { const struct cache_entry *ce = istate->cache[i]; - if (!ce_path_match(&the_index, ce, pathspec, NULL)) + if (!ce_path_match(istate, ce, pathspec, NULL)) continue; i = unmerge_index_entry_at(istate, i); }
--
2.18.0.1004.g6639190530