summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-01-23 20:22:05 +0700
committerJunio C Hamano <gitster@pobox.com>2014-01-23 13:03:00 -0800
commit74b4f7f27736f3e196a4eb3db41c68e37a6e2160 (patch)
treeb2d5a0308b3d200eb5e869cc27a2b1f6ec321493 /tree-walk.c
parent1649612a227eaa5af7cb0e2d059728c0148485d9 (diff)
downloadgit-74b4f7f27736f3e196a4eb3db41c68e37a6e2160.tar.gz
tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()nd/negative-pathspec
We do ignore trailing slash on a directory, so pathspec "abc/" matches directory "abc". A submodule is also a directory. Apply the same logic to it. This makes "git log submodule-path" and "git log submodule-path/" produce the same output. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-walk.c')
-rw-r--r--tree-walk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 680afda060..c29b6a3a56 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -543,7 +543,7 @@ static int match_entry(const struct pathspec_item *item,
if (matchlen > pathlen) {
if (match[pathlen] != '/')
return 0;
- if (!S_ISDIR(entry->mode))
+ if (!S_ISDIR(entry->mode) && !S_ISGITLINK(entry->mode))
return 0;
}