diff options
author | Eric Wong <normalperson@yhbt.net> | 2006-05-25 19:06:16 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-25 23:53:31 -0700 |
commit | c7053aa88f80e4983ec45fd39a44d146197c21d0 (patch) | |
tree | c005793ced0be9defa26a5ba78e7e61adcbbfebe /t/t4012-diff-binary.sh | |
parent | 003d6ddaf41aa5614ac49693d199d1ad5f21fcbf (diff) | |
download | git-c7053aa88f80e4983ec45fd39a44d146197c21d0.tar.gz |
tests: Remove heredoc usage inside quotes
The use of heredoc inside quoted strings doesn't seem to be
supported by dash. pdksh seems to handle it fine, however.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4012-diff-binary.sh')
-rwxr-xr-x | t/t4012-diff-binary.sh | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index bdd95c0d3d..323606c65c 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -16,25 +16,20 @@ test_expect_success 'prepare repository' \ echo git >c && cat b b >d' -test_expect_success 'diff without --binary' \ - 'git-diff | git-apply --stat --summary >current && - cmp current - <<\EOF +cat > expected <<\EOF a | 2 +- b | Bin c | 2 +- d | Bin 4 files changed, 2 insertions(+), 2 deletions(-) -EOF' +EOF +test_expect_success 'diff without --binary' \ + 'git-diff | git-apply --stat --summary >current && + cmp current expected' test_expect_success 'diff with --binary' \ 'git-diff --binary | git-apply --stat --summary >current && - cmp current - <<\EOF - a | 2 +- - b | Bin - c | 2 +- - d | Bin - 4 files changed, 2 insertions(+), 2 deletions(-) -EOF' + cmp current expected' # apply needs to be able to skip the binary material correctly # in order to report the line number of a corrupt patch. |