[PATCH 2/4] t4118: avoid sed invocation on file without terminating newline
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- May 6, 2009, 18:29 UTC
- Message-ID
- <IHOAO7NDkb8K9nkprnkd2QibZp-GnWBSpcJ8fxO9NTUsmXbuv4_2x5S6YNLzUogav4gLkrx9ClI@cipher.nrlssc.navy.mil>
- In-Reply-To
- <IHOAO7NDkb8K9nkprnkd2TGjPUHc5N7wdnoXRYKelDZEem1S0tynQeYlVheR46_5TDmYxS1O9i4@cipher.nrlssc.navy.mil>
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 <casey@nrlssc.navy.mil> --- 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.orig >file1 && - sed -e "/^[BQ]/d" <file2.orig >file2 && + cat file1 > file2 && echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods &&
-- 1.6.2.4.24.gde59d2