diff options
| author |  Brandon Casey <casey@nrlssc.navy.mil> | 2009-05-06 13:29:16 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-05-06 11:50:44 -0700 |
| commit | d8b69ecb4c467c044c08e0435bb22ade16ea580f (patch) | |
| tree | 5997d061b177661c19b9147c296763db2ca534fe /t | |
| parent | t4118: avoid sed invocation on file without terminating newline (diff) | |
| download | tgif-d8b69ecb4c467c044c08e0435bb22ade16ea580f.tar.xz | |
t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
Some versions of sed exit non-zero if the file they are supplied is not
newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. So
rework this test to avoid doing so.
This affects tests t8001-annotate.sh and t8002-blame.sh.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/annotate-tests.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index cacb273aff..396b9653a3 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -114,7 +114,10 @@ test_expect_success \ test_expect_success \ 'some edit' \ 'mv file file.orig && - sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" < file.orig > file && + { + cat file.orig && + echo + } | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" > file && echo "incomplete" | tr -d "\\012" >>file && GIT_AUTHOR_NAME="D" git commit -a -m "edit"' |