mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Noticed by Mike Hommey.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2008-03-01 01:10:12 -08:00
parent a0c14cbb2e
commit c3b088d9da
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6024-recursive-merge.sh
View File

@ -81,8 +81,8 @@ EOF
test_expect_success "virtual trees were processed" "git diff expect out" test_expect_success "virtual trees were processed" "git diff expect out"
git reset --hard
test_expect_success 'refuse to merge binary files' ' test_expect_success 'refuse to merge binary files' '
git reset --hard &&
printf "\0" > binary-file && printf "\0" > binary-file &&
git add binary-file && git add binary-file &&
git commit -m binary && git commit -m binary &&