mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
a0c14cbb2e
commit
c3b088d9da
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue