diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:06 -0700 |
| commit | 1273738f05dedc63865085deb5d1fb8816ff809c (patch) | |
| tree | b63d47e65064ac061ed300c01ab26129a31db678 /tree-walk.c | |
| parent | 9fdc1cc872308869d76665be55367eef48f05ff6 (diff) | |
| parent | 33e0f62ba981ebfdcab8c9fb6d2935712a7b9d41 (diff) | |
| download | git-1273738f05dedc63865085deb5d1fb8816ff809c.tar.gz | |
Merge branch 'nd/struct-pathspec'
* nd/struct-pathspec:
pathspec: rename per-item field has_wildcard to use_wildcard
Improve tree_entry_interesting() handling code
Convert read_tree{,_recursive} to support struct pathspec
Reimplement read_tree_recursive() using tree_entry_interesting()
Diffstat (limited to 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tree-walk.c b/tree-walk.c index 322becc3b4..33f749e1e7 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -598,7 +598,7 @@ int tree_entry_interesting(const struct name_entry *entry, &never_interesting)) return 1; - if (ps->items[i].has_wildcard) { + if (ps->items[i].use_wildcard) { if (!fnmatch(match + baselen, entry->path, 0)) return 1; @@ -614,7 +614,7 @@ int tree_entry_interesting(const struct name_entry *entry, } match_wildcards: - if (!ps->items[i].has_wildcard) + if (!ps->items[i].use_wildcard) continue; /* |