diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-08-13 19:14:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-14 00:14:42 +0300 |
| commit | 6d2df284e7f4d7cd9f46992282ef59a72a9db527 (patch) | |
| tree | e574b2e2c62144926ced7a251f82260a61211d16 /resolve-undo.c | |
| parent | 7f944e264ebe2fcf9a2c228a9fc9463ab3274d39 (diff) | |
dir.c: remove an implicit dependency on the_index in pathspec code
Make the match_patchspec API and friends take an index_state instead
of assuming the_index in dir.c. All external call sites are converted
blindly to keep the patch simple and retain current behavior.
Individual call sites may receive further updates to 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>
Diffstat (limited to 'resolve-undo.c')
| -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 c30ae5cf49..d2e2d22b7f 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(ce, pathspec, NULL)) + if (!ce_path_match(&the_index, ce, pathspec, NULL)) continue; i = unmerge_index_entry_at(istate, i); } |