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>
Junio C Hamano committed
Mar 1, 2008 at 01:10 UTC
c3b088d9daa8294101dbfed4b2db0373ef24d52b
1 file changed
+1
-1
t/t6024-recursive-merge.sh
+1
-1
@@ -81,8 +81,8 @@ EOF
81
82
test_expect_success "virtual trees were processed" "git diff expect out"
83
84
-git reset --hard
84
test_expect_success 'refuse to merge binary files' '
85
+ git reset --hard &&
86
printf "\0" > binary-file &&
87
git add binary-file &&
88
git commit -m binary &&