Skip to content

Commit

Permalink
Merge branch 'sg/t3600-nul-sha1-fix'
Browse files Browse the repository at this point in the history
* sg/t3600-nul-sha1-fix:
  t3600: fix broken "choking git rm" test
  • Loading branch information
Junio C Hamano committed Oct 30, 2013
2 parents 0bfc7c1 + 056f34b commit 504c194
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions t/t3600-rm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
git reset -q --hard &&
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
i=0 &&
while test $i -lt 12000
do
echo "100644 $_z40 0 some-file-$i"
echo "100644 1234567890123456789012345678901234567890 0 some-file-$i"
i=$(( $i + 1 ))
done | git update-index --index-info &&
git rm -n "some-file-*" | :;
test -f .git/index.lock
status=$?
rm -f .git/index.lock
git reset -q --hard
test "$status" != 0
git rm -n "some-file-*" | : &&
test_path_is_missing .git/index.lock
'

test_expect_success 'rm removes subdirectories recursively' '
Expand Down

0 comments on commit 504c194

Please sign in to comment.