Revision 89a70b80ebabd237bb407f9321f24677f4f1d16d authored by Johannes Schindelin on 03 January 2018, 16:54:54 UTC, committed by Junio C Hamano on 03 January 2018, 23:55:50 UTC
When cleaning up files in the $HOME directory, it really makes sense to quote the path, especially in Git's test suite, where the HOME directory is *guaranteed* to contain spaces in its name. It would appear that those two tests pass even without cleaning up the files, but really more by pure chance than by design (the cleanup seems not actually to be necessary). However, if anybody would have a left-over `trash/` directory in Git's `t/` directory, these tests would fail, because they would all of a sudden try to delete that directory, but without the `-r` (recursive) flag. That is how this issue was found. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 567c53d
t7010-setup.sh
#!/bin/sh
test_description='setup taking and sanitizing funny paths'
. ./test-lib.sh
test_expect_success setup '
mkdir -p a/b/c a/e &&
D=$(pwd) &&
>a/b/c/d &&
>a/e/f
'
test_expect_success 'git add (absolute)' '
git add "$D/a/b/c/d" &&
git ls-files >current &&
echo a/b/c/d >expect &&
test_cmp expect current
'
test_expect_success 'git add (funny relative)' '
rm -f .git/index &&
(
cd a/b &&
git add "../e/./f"
) &&
git ls-files >current &&
echo a/e/f >expect &&
test_cmp expect current
'
test_expect_success 'git rm (absolute)' '
rm -f .git/index &&
git add a &&
git rm -f --cached "$D/a/b/c/d" &&
git ls-files >current &&
echo a/e/f >expect &&
test_cmp expect current
'
test_expect_success 'git rm (funny relative)' '
rm -f .git/index &&
git add a &&
(
cd a/b &&
git rm -f --cached "../e/./f"
) &&
git ls-files >current &&
echo a/b/c/d >expect &&
test_cmp expect current
'
test_expect_success 'git ls-files (absolute)' '
rm -f .git/index &&
git add a &&
git ls-files "$D/a/e/../b" >current &&
echo a/b/c/d >expect &&
test_cmp expect current
'
test_expect_success 'git ls-files (relative #1)' '
rm -f .git/index &&
git add a &&
(
cd a/b &&
git ls-files "../b/c"
) >current &&
echo c/d >expect &&
test_cmp expect current
'
test_expect_success 'git ls-files (relative #2)' '
rm -f .git/index &&
git add a &&
(
cd a/b &&
git ls-files --full-name "../e/f"
) >current &&
echo a/e/f >expect &&
test_cmp expect current
'
test_expect_success 'git ls-files (relative #3)' '
rm -f .git/index &&
git add a &&
(
cd a/b &&
git ls-files "../e/f"
) >current &&
echo ../e/f >expect &&
test_cmp expect current
'
test_expect_success 'commit using absolute path names' '
git commit -m "foo" &&
echo aa >>a/b/c/d &&
git commit -m "aa" "$(pwd)/a/b/c/d"
'
test_expect_success 'log using absolute path names' '
echo bb >>a/b/c/d &&
git commit -m "bb" "$(pwd)/a/b/c/d" &&
git log a/b/c/d >f1.txt &&
git log "$(pwd)/a/b/c/d" >f2.txt &&
test_cmp f1.txt f2.txt
'
test_expect_success 'blame using absolute path names' '
git blame a/b/c/d >f1.txt &&
git blame "$(pwd)/a/b/c/d" >f2.txt &&
test_cmp f1.txt f2.txt
'
test_expect_success 'setup deeper work tree' '
test_create_repo tester
'
test_expect_success 'add a directory outside the work tree' '(
cd tester &&
d1="$(cd .. ; pwd)" &&
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" &&
test_must_fail git add "$f"
)'
test_expect_success 'add a file outside the work tree, nasty case 2' '(
cd tester &&
f="$(pwd | sed "s/.$//")x" &&
echo "$f" &&
touch "$f" &&
test_must_fail git add "$f"
)'
test_done
Computing file changes ...
