diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-13 21:37:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-13 21:37:53 (GMT) |
| commit | b4e931d84eddaab144643831d9508ea12d9cf38e (patch) | |
| tree | a20d81b50c24cf2a5fa10d30e6046e8c360ed84c /tree-walk.c | |
| parent | 3330a2c4f6b494f2b02fda2869d85bc1f8e019aa (diff) | |
| parent | e4ddb05720710213108cd13ddd5a115e12a6211d (diff) | |
| download | git-b4e931d84eddaab144643831d9508ea12d9cf38e.zip git-b4e931d84eddaab144643831d9508ea12d9cf38e.tar.gz git-b4e931d84eddaab144643831d9508ea12d9cf38e.tar.bz2 | |
Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint
The pathspec matching code, while comparing two trees (e.g. "git
diff A B -- path1 path2") was too aggressive and failed to match
some paths when multiple pathspecs were involved.
* as/tree-walk-fix-aggressive-short-cut:
tree_entry_interesting: match against all pathspecs
Diffstat (limited to 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-walk.c b/tree-walk.c index 5ece8c3..e06f240 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -743,7 +743,7 @@ match_wildcards: if (item->nowildcard_len && !match_wildcard_base(item, base_str, baselen, &matched)) - return entry_not_interesting; + continue; /* * Concatenate base and entry->path into one and do |