summaryrefslogtreecommitdiff
path: root/tree-diff.c
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2009-03-31 15:05:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-02 02:35:16 (GMT)
commitf0946cb826b9b6c01976860fdd9dfd498ce0ec5e (patch)
tree09281bb58c7864349b0185afab8a36de9571bb29 /tree-diff.c
parent5bd27ebb18f2dd745d1226b59b9f863c63c15fb2 (diff)
downloadgit-f0946cb826b9b6c01976860fdd9dfd498ce0ec5e.zip
git-f0946cb826b9b6c01976860fdd9dfd498ce0ec5e.tar.gz
git-f0946cb826b9b6c01976860fdd9dfd498ce0ec5e.tar.bz2
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>
Diffstat (limited to 'tree-diff.c')
-rw-r--r--tree-diff.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/tree-diff.c b/tree-diff.c
index 9f67af6..b05d0f4 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? */