author | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 May 2009 22:01:19 +0000 (15:01 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 May 2009 22:01:19 +0000 (15:01 -0700) |
* 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
match_tree_entry(): a pathspec only matches at directory boundaries
tree_entry_interesting: a pathspec only matches at directory boundary
t/t3101-ls-tree-dirname.sh | patch | blob | history | |
t/t4010-diff-pathspec.sh | patch | blob | history | |
tree-diff.c | patch | blob | history | |
tree.c | patch | blob | history |
index 4dd7d12bac62eae23516686c0ece0edf037f0317..51cb4a30f571772399697bc073153b7e956853bf 100755 (executable)
EOF
test_output'
+test_expect_success 'ls-tree filter is leading path match' '
+ git ls-tree $tree pa path3/a >current &&
+ >expected &&
+ test_output
+'
+
test_done
index 9322298ecc6cb79f0123dea4e329317c5bfbfd11..94df7ae53a0ef47c0ef10ca6b3215ffdf38fa399 100755 (executable)
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
'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 9f67af6c1fbb9130962cd373d8e2ebecf543c640..b05d0f43555d28f872fd5225e6773eeb636ef302 100644 (file)
--- 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? */
index 03e782a9cabc0a12ed5baec0ef59c99f19dbc843..d82a047e5550702bf6e1fd5a8930897124e7a96f 100644 (file)
--- a/tree.c
+++ b/tree.c
/* If it doesn't match, move along... */
if (strncmp(base, match, matchlen))
continue;
- /* The base is a subdirectory of a path which was specified. */
- return 1;
+ /* pathspecs match only at the directory boundaries */
+ if (!matchlen ||
+ base[matchlen] == '/' ||
+ match[matchlen - 1] == '/')
+ return 1;
+ continue;
}
/* Does the base match? */