diff options
| author | Gary V. Vaughan <git@mlists.thewrittenword.com> | 2010-05-14 11:31:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-01 01:59:27 +0200 |
| commit | 4fdf71be1ca3a817851a14f91b75e7d30f885a48 (patch) | |
| tree | 5e280e04305b3b1f019ce56e4293a01b77d152a2 /t/t3903-stash.sh | |
| parent | Do not use "diff" found on PATH while building and installing (diff) | |
| download | git-4fdf71be1ca3a817851a14f91b75e7d30f885a48.tar.xz git-4fdf71be1ca3a817851a14f91b75e7d30f885a48.zip | |
tests: use "test_cmp", not "diff", when verifying the result
In tests, call test_cmp rather than raw diff where possible (i.e. if
the output does not go to a pipe), to allow the use of, say, 'cmp'
when the default 'diff -u' is not compatible with a vendor diff.
When that is not possible, use $DIFF, as set in GIT-BUILD-OPTIONS.
Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 476e5ec038..7e47030a15 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -81,7 +81,7 @@ test_expect_success 'drop top stash' ' git stash && git stash drop && git stash list > stashlist2 && - diff stashlist1 stashlist2 && + test_cmp stashlist1 stashlist2 && git stash apply && test 3 = $(cat file) && test 1 = $(git show :file) && |