Skip to content

Commit 58db64f

Browse files
dschoJunio C Hamano
authored andcommitted
make t8001 work on Mac OS X again
The test was recently broken to expect sed to leave the incomplete line at the end without newline. POSIX says that output of the pattern space is to be followed by a newline, while GNU adds the newline back only when it was stripped when input. GNU behaviour is arguably more intuitive and nicer, but we should not depend on it. Signed-off-by: Johannes Schindelin <[email protected]> Acked-by: Shawn O. Pearce <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eec1025 commit 58db64f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/annotate-tests.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ test_expect_success \
114114
test_expect_success \
115115
'some edit' \
116116
'mv file file.orig &&
117-
sed -e "s/^3A/99/" -e "/^1A/d" < file.orig > file &&
117+
sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" < file.orig > file &&
118+
echo "incomplete" | tr -d "\\012" >>file &&
118119
GIT_AUTHOR_NAME="D" git commit -a -m "edit"'
119120

120121
test_expect_success \

0 commit comments

Comments
 (0)