t6024: move "git reset" to prepare for a test inside the test itself

Noticed by Mike Hommey. Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Mar 1, 2008 · c3b088d · c3b088d
1 parent a0c14cb
commit c3b088d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
@@ -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 &&