Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:37:53 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:37:53 +0000 (13:37 -0800)
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

1  2 
tree-walk.c
diff --cc tree-walk.c
Simple merge