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

gitster · gitster · commit c3b088d9daa8 · 2008-03-01T01:10:12.000-08:00
Noticed by Mike Hommey.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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 &&
