Skip to content

Commit 325fb15

Browse files
drafnelgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7235704 commit 325fb15

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t4118-apply-empty-context.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test_expect_success setup '
2323
cat file2 >file2.orig &&
2424
git add file1 file2 &&
2525
sed -e "/^B/d" <file1.orig >file1 &&
26-
sed -e "/^[BQ]/d" <file2.orig >file2 &&
26+
cat file1 > file2 &&
2727
echo Q | tr -d "\\012" >>file2 &&
2828
cat file1 >file1.mods &&
2929
cat file2 >file2.mods &&

0 commit comments

Comments
 (0)