From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon, 13 Aug 2018 16:14:37 +0000 (+0200)
Subject: resolve-undo.c: use the right index instead of the_index
X-Git-Tag: v2.19.0-rc0~16^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff82d1260f55836e18625fbae1697dbbe3090531;p=git

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>
---

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);
 	}