diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2009-05-06 13:29:15 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-06 11:49:14 -0700 |
| commit | 325fb151047d668133cd456e78953f1b1aa09114 (patch) | |
| tree | 9e88d53d2728f4ebc197a7fb86efd92d6ebb76a5 | |
| parent | 723570469f54449e54dcc8bbb8f1dcbaff29d535 (diff) | |
| download | git-325fb151047d668133cd456e78953f1b1aa09114.tar.gz | |
t4118: avoid sed invocation on file without terminating newline
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | 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 314bc6e68d..65f2e4c3ef 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 && |