resolve-undo.c: use the right index instead of the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Aug 13, 2018 at 18:14 UTC
ff82d1260f55836e18625fbae1697dbbe3090531
1 file changed
+1
-1
resolve-undo.c
+1
-1
@@ -188,7 +188,7 @@ void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
188
189
for (i = 0; i < istate->cache_nr; i++) {
190
const struct cache_entry *ce = istate->cache[i];
191
- if (!ce_path_match(&the_index, ce, pathspec, NULL))
191
+ if (!ce_path_match(istate, ce, pathspec, NULL))
192
continue;
193
i = unmerge_index_entry_at(istate, i);
194
}