diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 08:35:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 17:56:08 (GMT) |
| commit | 5ab06518a71a8bd128a2aea38ddb537870d3ea2b (patch) | |
| tree | 4f7b5a7afece7747e97ee537e3e0f4cbd6ece1a2 /resolve-undo.c | |
| parent | 480ca6449ed0981311b8aef2fbaa89d024b881ee (diff) | |
| download | git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.zip git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.gz git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.bz2 | |
convert unmerge_cache to take struct pathspec
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resolve-undo.c b/resolve-undo.c index 639eb9c..4b78e6f 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -173,7 +173,7 @@ void unmerge_marked_index(struct index_state *istate) } } -void unmerge_index(struct index_state *istate, const char **pathspec) +void unmerge_index(struct index_state *istate, const struct pathspec *pathspec) { int i; @@ -182,7 +182,7 @@ void unmerge_index(struct index_state *istate, const char **pathspec) for (i = 0; i < istate->cache_nr; i++) { struct cache_entry *ce = istate->cache[i]; - if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL)) + if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL)) continue; i = unmerge_index_entry_at(istate, i); } |