Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit bf7ca98

Browse files
sschuberthdscho
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 acf70ef commit bf7ca98

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
@@ -182,7 +182,9 @@ It does not apply to blobs recorded in its index.")"
182182
}
183183

184184
clean_abort () {
185-
test $# = 0 || echo >&2 "$@"
185+
test $# = 0 || cat >&2 <<EOF
186+
$@
187+
EOF
186188
rm -fr "$dotest"
187189
exit 1
188190
}

0 commit comments

Comments
 (0)