diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:01:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-03 15:01:19 -0700 |
| commit | 652f0c8f1df362755253fe9c5a975be7e5a5cbdc (patch) | |
| tree | a3b08e754f6128a37ca14741d2269b08489f0613 /tree-diff.c | |
| parent | 934747323c397ffe64b6dcdf2bf73128d8e36968 (diff) | |
| parent | 8092bfb6c23776d72ce4b38a3b517c3753c3b9fe (diff) | |
| download | git-652f0c8f1df362755253fe9c5a975be7e5a5cbdc.tar.gz | |
Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1
* bs/maint-1.6.0-tree-walk-prefix:
match_tree_entry(): a pathspec only matches at directory boundaries
tree_entry_interesting: a pathspec only matches at directory boundary
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tree-diff.c b/tree-diff.c index 9f67af6c1f..b05d0f4355 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -118,10 +118,16 @@ static int tree_entry_interesting(struct tree_desc *desc, const char *base, int continue; /* - * The base is a subdirectory of a path which - * was specified, so all of them are interesting. + * If the base is a subdirectory of a path which + * was specified, all of them are interesting. */ - return 2; + if (!matchlen || + base[matchlen] == '/' || + match[matchlen - 1] == '/') + return 2; + + /* Just a random prefix match */ + continue; } /* Does the base match? */ |