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/t1002-read-tree-m-u-2way.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/t1002-read-tree-m-u-2way.sh')
| -rwxr-xr-x | t/t1002-read-tree-m-u-2way.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh index 42e5cf818..e04990eaf 100755 --- a/t/t1002-read-tree-m-u-2way.sh +++ b/t/t1002-read-tree-m-u-2way.sh @@ -16,7 +16,7 @@ compare_change () { sed >current \ -e '/^--- /d; /^+++ /d; /^@@ /d;' \ -e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /' "$1" - git diff expected current + test_cmp expected current } check_cache_at () { |