diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-23 22:28:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-24 00:01:56 -0700 |
| commit | 3af828634fa5bdbca1b2061a81df8b3fa73b0d34 (patch) | |
| tree | f4d4a50e8c1686b3ecd796a09f98cc6ca13bc907 /t/t6024-recursive-merge.sh | |
| parent | 998b912927281a871e8d379e2b3a4385c775c4fe (diff) | |
| download | git-3af828634fa5bdbca1b2061a81df8b3fa73b0d34.tar.gz | |
tests: do not use implicit "git diff --no-index"
As a general principle, we should not use "git diff" to validate the
results of what git command that is being tested has done. We would not
know if we are testing the command in question, or locating a bug in the
cute hack of "git diff --no-index".
Rather use test_cmp for that purpose.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 23d24d3feb..6a6a13002d 100755 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -70,7 +70,7 @@ G >>>>>>> G:a1 EOF -test_expect_success "result contains a conflict" "git diff expect a1" +test_expect_success "result contains a conflict" "test_cmp expect a1" git ls-files --stage > out cat > expect << EOF @@ -79,7 +79,7 @@ cat > expect << EOF 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 EOF -test_expect_success "virtual trees were processed" "git diff expect out" +test_expect_success "virtual trees were processed" "test_cmp expect out" test_expect_success 'refuse to merge binary files' ' git reset --hard && |