Skip to content

Commit cae5461

Browse files
sschuberthnalla
authored andcommitted
am: Use cat instead of echo to avoid DOS line-endings (fixes t4150)
Along the lines of 05d0e3b and f33946d, use cat instead of echo to avoid line ending mismatches in the test result of "am empty-file does not infloop" which make the test fail. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 052d6c8 commit cae5461

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

git-am.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ It does not apply to blobs recorded in its index.")"
185185
}
186186

187187
clean_abort () {
188-
test $# = 0 || echo >&2 "$@"
188+
test $# = 0 || cat >&2 <<EOF
189+
$@
190+
EOF
189191
rm -fr "$dotest"
190192
exit 1
191193
}

0 commit comments

Comments
 (0)