Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
resolve-undo.c: use the right index instead of the_index
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Mon, 13 Aug 2018 16:14:37 +0000
(18:14 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Aug 2018 21:14:44 +0000
(14:14 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
resolve-undo.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
b67b551
)
diff --git
a/resolve-undo.c
b/resolve-undo.c
index d2e2d22b7fb6a087eced2320fbd766bfc8ea1efc..236320f179cbf60a312f882ee57e1f843398e907 100644
(file)
--- 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];
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);
}
continue;
i = unmerge_index_entry_at(istate, i);
}