undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg/t3600-nul-sha1-fix'

Browse Source 
* sg/t3600-nul-sha1-fix:
  t3600: fix broken "choking git rm" test
This commit is contained in:
Junio C Hamano 2013-10-30 12:10:09 -07:00
commit 504c1942a9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/t3600-rm.sh
View File

@ -240,18 +240,15 @@ test_expect_success 'refresh index before checking if it is up-to-date' '
test_expect_success 'choking "git rm" should not let it die with cruft' ' test_expect_success 'choking "git rm" should not let it die with cruft' '
git reset -q --hard && git reset -q --hard &&
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
i=0 && i=0 &&
while test $i -lt 12000 while test $i -lt 12000
do do
echo "100644 $_z40 0 some-file-$i" echo "100644 1234567890123456789012345678901234567890 0 some-file-$i"
i=$(( $i + 1 )) i=$(( $i + 1 ))
done | git update-index --index-info && done | git update-index --index-info &&
git rm -n "some-file-*" | :; git rm -n "some-file-*" | : &&
test -f .git/index.lock test_path_is_missing .git/index.lock
status=$?
rm -f .git/index.lock
git reset -q --hard
test "$status" != 0
' '
test_expect_success 'rm removes subdirectories recursively' ' test_expect_success 'rm removes subdirectories recursively' '