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

Commit 4dd0316

Browse files
sschuberthkasal
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 69d482f commit 4dd0316

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

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

0 commit comments

Comments
 (0)