From c3b088d9daa8294101dbfed4b2db0373ef24d52b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 1 Mar 2008 01:10:12 -0800 Subject: [PATCH] t6024: move "git reset" to prepare for a test inside the test itself Noticed by Mike Hommey. Signed-off-by: Junio C Hamano --- t/t6024-recursive-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 149ea8543..23d24d3fe 100755 --- 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 && -- 2.11.0