mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: rename match_pathspec_depth() to match_pathspec()

Browse Source 
A long time ago, for some reason I was not happy with
match_pathspec(). I created a better version, match_pathspec_depth()
that was suppose to replace match_pathspec()
eventually. match_pathspec() has finally been gone since 6 months
ago. Use the shorter name for match_pathspec_depth().

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
2014-01-24 20:40:30 +07:00
committed by Junio C Hamano
parent ebb32893ba
commit 854b09592c
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/ls-files.c
View File

@ -139,7 +139,8 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)
if (len >= ce_namelen(ce))
die("git ls-files: internal error - cache entry not superset of prefix");
if (!match_pathspec_depth(&pathspec, ce->name, ce_namelen(ce), len, ps_matched))
if (!match_pathspec(&pathspec, ce->name, ce_namelen(ce),
len, ps_matched))
return;
if (tag && *tag && show_valid_bit &&
@ -195,7 +196,8 @@ static void show_ru_info(void)
len = strlen(path);
if (len < max_prefix_len)
continue; /* outside of the prefix */
if (!match_pathspec_depth(&pathspec, path, len, max_prefix_len, ps_matched))
if (!match_pathspec(&pathspec, path, len,
max_prefix_len, ps_matched))
continue; /* uninterested */
for (i = 0; i < 3; i++) {
if (!ui->mode[i])