mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-20 09:14:07 +02:00
Code

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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-08-13 18:14:37 +02:00 committed by Junio C Hamano
parent b67b55127c
commit ff82d1260f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resolve-undo.c
View File

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