diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2009-03-31 17:05:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-01 19:35:16 -0700 |
| commit | f0946cb826b9b6c01976860fdd9dfd498ce0ec5e (patch) | |
| tree | 09281bb58c7864349b0185afab8a36de9571bb29 | |
| parent | 5bd27ebb18f2dd745d1226b59b9f863c63c15fb2 (diff) | |
| download | git-f0946cb826b9b6c01976860fdd9dfd498ce0ec5e.tar.gz git-f0946cb826b9b6c01976860fdd9dfd498ce0ec5e.tar.xz | |
tree_entry_interesting: a pathspec only matches at directory boundary
Previously the code did a simple prefix match, which means that a
path in a directory "frotz/" would have matched with pathspec "f".
Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4010-diff-pathspec.sh | 8 | ||||
| -rw-r--r-- | tree-diff.c | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index ad3d9e484..4c4c8b157 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -62,4 +62,12 @@ test_expect_success \ 'git diff-index --cached $tree -- file0/ >current && compare_diff_raw current expected' +test_expect_success 'diff-tree pathspec' ' + tree2=$(git write-tree) && + echo "$tree2" && + git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current && + >expected && + test_cmp expected current +' + test_done diff --git a/tree-diff.c b/tree-diff.c index 9f67af6c1..b05d0f435 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? */ |