[PATCH 2/2] Added test from David Glasser.
From: <hidden>
Date: 2016-06-15 22:49:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Davi Reis <redacted> --- builtin/ls-tree.c | 2 +- t/t3100-ls-tree-restrict.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index fa427e2..37920d0 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c@@ -52,7 +52,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname) speclen = strlen(spec); if (speclen <= len) continue; - if (spec[len] != 0 && spec[len] != '/') + if (spec[len] != '/') continue; if (memcmp(pathname, spec, len)) continue;
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index eee0d34..9dd74b5 100755
--- a/t/t3100-ls-tree-restrict.sh
+++ b/t/t3100-ls-tree-restrict.sh@@ -165,4 +165,13 @@ test_expect_success \ EOF test_output' +test_expect_success \ + 'ls-tree with one path a prefix of the other' \ + 'git ls-tree $tree path2/baz path2/bazbo >current && + make_expected <<\EOF && +040000 tree X path2/baz +120000 blob X path2/bazbo +EOF + test_output' + test_done
--
1.7.2.2