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/t5515-fetch-merge-logic.sh | |
| parent | 998b912927281a871e8d379e2b3a4385c775c4fe (diff) | |
| download | git-3af828634fa5bdbca1b2061a81df8b3fa73b0d34.tar.gz git-3af828634fa5bdbca1b2061a81df8b3fa73b0d34.tar.xz | |
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/t5515-fetch-merge-logic.sh')
| -rwxr-xr-x | t/t5515-fetch-merge-logic.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 65c37744a..3def75eeb 100755 --- a/t/t5515-fetch-merge-logic.sh +++ b/t/t5515-fetch-merge-logic.sh @@ -151,7 +151,7 @@ do git show-ref >"$actual_r" && if test -f "$expect_f" then - git diff -u "$expect_f" "$actual_f" && + test_cmp "$expect_f" "$actual_f" && rm -f "$actual_f" else # this is to help developing new tests. @@ -160,7 +160,7 @@ do fi && if test -f "$expect_r" then - git diff -u "$expect_r" "$actual_r" && + test_cmp "$expect_r" "$actual_r" && rm -f "$actual_r" else # this is to help developing new tests. |