diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-01-24 20:40:29 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-24 14:37:09 -0800 |
| commit | ebb32893bad46bf5edae881552672a47dd2684b8 (patch) | |
| tree | 33f26d579d3f3025af77d4dfeefb6a884fb36d1b /wt-status.c | |
| parent | 429bb40abdb5b42ffdde5b1a58f9a37da723d179 (diff) | |
| download | git-ebb32893bad46bf5edae881552672a47dd2684b8.tar.gz | |
pathspec: convert some match_pathspec_depth() to dir_path_match()
This helps reduce the number of match_pathspec_depth() call sites and
show how m_p_d() is used. And it usage is:
- match against an index entry (ce_path_match or match_pathspec_depth
in ls-files)
- match against a dir_entry from read_directory (dir_path_match and
match_pathspec_depth in clean.c, which will be converted later)
- resolve-undo (rerere.c and ls-files.c)
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 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 295c09e3fc..a452407dad 100644 --- a/wt-status.c +++ b/wt-status.c @@ -552,7 +552,7 @@ static void wt_status_collect_untracked(struct wt_status *s) for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; if (cache_name_is_other(ent->name, ent->len) && - match_pathspec_depth(&s->pathspec, ent->name, ent->len, 0, NULL)) + dir_path_match(ent, &s->pathspec, 0, NULL)) string_list_insert(&s->untracked, ent->name); free(ent); } @@ -560,7 +560,7 @@ static void wt_status_collect_untracked(struct wt_status *s) for (i = 0; i < dir.ignored_nr; i++) { struct dir_entry *ent = dir.ignored[i]; if (cache_name_is_other(ent->name, ent->len) && - match_pathspec_depth(&s->pathspec, ent->name, ent->len, 0, NULL)) + dir_path_match(ent, &s->pathspec, 0, NULL)) string_list_insert(&s->ignored, ent->name); free(ent); } |