resolve-undo.c: use the right index instead of the_index

pclouds · gitster · commit ff82d1260f55 · 2018-08-13T14:14:44.000-07:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ void unmerge_index(struct index_state istate, const struct pathspec pathspec)`
`188`	`188`
`189`	`189`	`for (i = 0; i < istate->cache_nr; i++) {`
`190`	`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`	`192`	`continue;`
`193`	`193`	`i = unmerge_index_entry_at(istate, i);`
`194`	`194`	`}`