Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ls-tree $di $dir: do not mistakenly recurse into directories

When applying two pathspecs, one of which is named as a prefix to the
other, we mistakenly recursed into the shorter one.

Noticed and fixed by David Reis.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit b294ed637d3c13cd96ba6f0e464e02e170cc54a6 1 parent 9904fad
Junio C Hamano gitster authored
Showing with 11 additions and 0 deletions.
  1. +2 −0  builtin/ls-tree.c
  2. +9 −0 t/t3100-ls-tree-restrict.sh
2  builtin/ls-tree.c
View
@@ -52,6 +52,8 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
speclen = strlen(spec);
if (speclen <= len)
continue;
+ if (spec[len] && spec[len] != '/')
+ continue;
if (memcmp(pathname, spec, len))
continue;
return 1;
9 t/t3100-ls-tree-restrict.sh
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.