From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Wed, 6 May 2009 18:29:16 +0000 (-0500)
Subject: t/annotate-tests.sh: avoid passing a non-newline terminated file to sed
X-Git-Tag: v1.6.3~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d8b69ecb4c467c044c08e0435bb22ade16ea580f;p=git.git

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>
---

diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index cacb273af..396b9653a 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"'