t6024: move "git reset" to prepare for a test inside the test itself
authorJunio C Hamano <gitster@pobox.com>
Sat, 1 Mar 2008 09:10:12 +0000 (01:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Mar 2008 09:10:12 +0000 (01:10 -0800)
Noticed by Mike Hommey.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6024-recursive-merge.sh

index 149ea85..23d24d3 100755 (executable)
@@ -81,8 +81,8 @@ EOF
 
 test_expect_success "virtual trees were processed" "git diff expect out"
 
-git reset --hard
 test_expect_success 'refuse to merge binary files' '
+       git reset --hard &&
        printf "\0" > binary-file &&
        git add binary-file &&
        git commit -m binary &&