diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 22:50:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 22:50:24 +0200 |
| commit | cb6c8ed2fea4515ee876c40a2bbd5541e24fc12b (patch) | |
| tree | 3cca5122466eca387bf576ee3b3846f50e1e8ce7 /diff-tree.c | |
| parent | diff-tree: show hex sha1 of the single-commit argument case correctly. (diff) | |
| download | git-cb6c8ed2fea4515ee876c40a2bbd5541e24fc12b.tar.xz git-cb6c8ed2fea4515ee876c40a2bbd5541e24fc12b.zip | |
diff-tree: fix up comparison of "interesting" sub-trees
We used to trigger the "interesting subdirectory" check for any
matching name that started with the same character series, regardless
of whether it had the matching slash or not.
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/diff-tree.c b/diff-tree.c index acd1524343..3bc7480944 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -209,6 +209,11 @@ static int interesting(void *tree, unsigned long size, const char *base) if (pathlen > matchlen) continue; + if (matchlen > pathlen) { + if (match[pathlen] != '/') + continue; + } + if (strncmp(path, match, pathlen)) continue; |