tests: make sure input to sed is newline terminated
POSIX only requires sed to work on text files and because it does not end with a newline, this commit's content is not a text file. Add a newline to fix it. Without this change, OS X sed helpfully adds a newline to actual.message, causing t9010.13 to fail. Reported-by: Torsten Bögershausen <tboegi@web.de> Tested-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Jonathan Nieder committed
Mar 28, 2011 at 22:08 UTC
4c502d68666acba7a83379c7abd971aafee91cf8
1 file changed
+6
-2
t/t9010-svn-fe.sh
+6
-2
@@ -407,7 +407,7 @@ test_expect_success 'NUL in log message, file content, and property name' '
407
OBJID
408
:000000 100644 OBJID OBJID A greeting
409
EOF
410
- printf "\n%s" "something with an ASCII NUL (Q)" >expect.message &&
410
+ printf "\n%s\n" "something with an ASCII NUL (Q)" >expect.message &&
411
printf "%s\n" "helQo" >expect.hello1 &&
412
printf "%s\n" "link hello" >expect.hello2 &&
413
{
@@ -465,7 +465,11 @@ test_expect_success 'NUL in log message, file content, and property name' '
465
git diff-tree --root --stdin |
466
sed "s/$_x40/OBJID/g"
467
} >actual &&
468
- git cat-file commit HEAD | nul_to_q | sed -ne "/^\$/,\$ p" >actual.message &&
468
+ {
469
+ git cat-file commit HEAD | nul_to_q &&
470
+ echo
471
+ } |
472
+ sed -ne "/^\$/,\$ p" >actual.message &&
473
git cat-file blob HEAD^:greeting | nul_to_q >actual.hello1 &&
474
git cat-file blob HEAD:greeting | nul_to_q >actual.hello2 &&
475
test_cmp expect actual &&