diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-08-13 18:14:37 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-13 14:14:44 -0700 |
| commit | ff82d1260f55836e18625fbae1697dbbe3090531 (patch) | |
| tree | e24ac7cbe711642f98c29baef3a16ba10b6071bb | |
| parent | archive-*.c: use the right repository (diff) | |
| download | tgif-ff82d1260f55836e18625fbae1697dbbe3090531.tar.xz | |
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>
| -rw-r--r-- | resolve-undo.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |