From: Brandon Casey Date: Wed, 06 May 2009 18:29:15 GMT Subject: [PATCH 2/4] t4118: avoid sed invocation on file without terminating newline Message-ID: In-Reply-To: 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. In this case the sed invocation can be avoided entirely since the resulting file is equivalent to a previously created file. So, just copy that file into place instead. Signed-off-by: Brandon Casey --- t/t4118-apply-empty-context.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh index 314bc6e..65f2e4c 100755 --- a/t/t4118-apply-empty-context.sh +++ b/t/t4118-apply-empty-context.sh @@ -23,7 +23,7 @@ test_expect_success setup ' cat file2 >file2.orig && git add file1 file2 && sed -e "/^B/d" file1 && - sed -e "/^[BQ]/d" file2 && + cat file1 > file2 && echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods && -- 1.6.2.4.24.gde59d2