diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-01-24 20:40:28 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-24 14:36:52 -0800 |
| commit | 429bb40abdb5b42ffdde5b1a58f9a37da723d179 (patch) | |
| tree | 62442107904393fa427b89bffc451dff3520c693 /resolve-undo.c | |
| parent | 017f804efc47234682fb0103a51ac453d96c56c1 (diff) | |
| download | git-429bb40abdb5b42ffdde5b1a58f9a37da723d179.tar.gz | |
pathspec: convert some match_pathspec_depth() to ce_path_match()
This helps reduce the number of match_pathspec_depth() call sites and
show how match_pathspec_depth() is used.
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 c09b00664e..67d1543141 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -182,7 +182,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 (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL)) + if (!ce_path_match(ce, pathspec, NULL)) continue; i = unmerge_index_entry_at(istate, i); } |