From 3296766eb5531ef051ae392114de5d75556f5613 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 6 Mar 2008 23:18:08 -0800 Subject: [PATCH] get_pathspec(): die when an out-of-tree path is given An earlier commit d089ebaa (setup: sanitize absolute and funny paths) made get_pathspec() aware of absolute paths, but with a botched interface that forced the callers to count the resulting pathspecs in order to detect an error of giving a path that is outside the work tree. This fixes it, by dying inside the function. We had ls-tree test that relied on a misfeature in the original implementation of its pathspec handling. Leading slashes were silently removed from them. However we allow giving absolute pathnames (people want to cut and paste from elsewhere) that are inside work tree these days, so a pathspec that begin with slash _should_ be treated as a full path. The test is adjusted to match the updated rule for get_pathspec(). Earlier I mistook three tests given by Robin that they should succeed, but these are attempts to add path outside work tree, which should fail loudly. These tests also have been fixed. Signed-off-by: Junio C Hamano --- setup.c | 2 ++ t/t3101-ls-tree-dirname.sh | 2 +- t/t7010-setup.sh | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/setup.c b/setup.c index 89c81e54e..41e298b8f 100644 --- a/setup.c +++ b/setup.c @@ -202,6 +202,8 @@ const char **get_pathspec(const char *prefix, const char **pathspec) const char *p = prefix_path(prefix, prefixlen, *src); if (p) *(dst++) = p; + else + exit(128); /* error message already given */ src++; } *dst = NULL; diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh index 39fe2676d..70f9ce9d5 100755 --- a/t/t3101-ls-tree-dirname.sh +++ b/t/t3101-ls-tree-dirname.sh @@ -120,7 +120,7 @@ EOF # having 1.txt and path3 test_expect_success \ 'ls-tree filter odd names' \ - 'git ls-tree $tree 1.txt /1.txt //1.txt path3/1.txt /path3/1.txt //path3//1.txt path3 /path3/ path3// >current && + 'git ls-tree $tree 1.txt ./1.txt .//1.txt path3/1.txt path3/./1.txt path3 path3// >current && cat >expected <<\EOF && 100644 blob X 1.txt 100644 blob X path3/1.txt diff --git a/t/t7010-setup.sh b/t/t7010-setup.sh index e809e0e2c..bc8ab6a61 100755 --- a/t/t7010-setup.sh +++ b/t/t7010-setup.sh @@ -142,15 +142,16 @@ test_expect_success 'setup deeper work tree' ' test_expect_success 'add a directory outside the work tree' '( cd tester && d1="$(cd .. ; pwd)" && - git add "$d1" + test_must_fail git add "$d1" )' + test_expect_success 'add a file outside the work tree, nasty case 1' '( cd tester && f="$(pwd)x" && echo "$f" && touch "$f" && - git add "$f" + test_must_fail git add "$f" )' test_expect_success 'add a file outside the work tree, nasty case 2' '( @@ -158,7 +159,7 @@ test_expect_success 'add a file outside the work tree, nasty case 2' '( f="$(pwd | sed "s/.$//")x" && echo "$f" && touch "$f" && - git add "$f" + test_must_fail git add "$f" )' test_done -- 2.26.2