diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-01 01:10:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-01 01:10:12 -0800 |
| commit | c3b088d9daa8294101dbfed4b2db0373ef24d52b (patch) | |
| tree | 09b1bc896e86ba14cae127c0d1d49ba69b279f21 /t/t6024-recursive-merge.sh | |
| parent | a0c14cbb2eebaa86b57ef797d0a03b836a817dd5 (diff) | |
| download | git-c3b088d9daa8294101dbfed4b2db0373ef24d52b.tar.gz | |
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>
Diffstat (limited to 't/t6024-recursive-merge.sh')
| -rwxr-xr-x | t/t6024-recursive-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 149ea8543a..23d24d3feb 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 && |