diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-03-06 19:48:59 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-06 17:09:53 -0800 |
| commit | 58db64f73c3dedb41467f915b45d305d52d04d2c (patch) | |
| tree | bb71bbae444b5a937c772e32cce9d6f3e5fe440f /t/annotate-tests.sh | |
| parent | eec102524fda2df7d2846e865805ca213119bf10 (diff) | |
| download | git-58db64f73c3dedb41467f915b45d305d52d04d2c.tar.gz | |
make t8001 work on Mac OS X again
The test was recently broken to expect sed to leave the
incomplete line at the end without newline.
POSIX says that output of the pattern space is to be followed by
a newline, while GNU adds the newline back only when it was
stripped when input. GNU behaviour is arguably more intuitive
and nicer, but we should not depend on it.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/annotate-tests.sh')
| -rw-r--r-- | t/annotate-tests.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index 87403da780..cacb273aff 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -114,7 +114,8 @@ test_expect_success \ test_expect_success \ 'some edit' \ 'mv file file.orig && - sed -e "s/^3A/99/" -e "/^1A/d" < file.orig > file && + sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" < file.orig > file && + echo "incomplete" | tr -d "\\012" >>file && GIT_AUTHOR_NAME="D" git commit -a -m "edit"' test_expect_success \ |