Merge branch 'some-CR-fixes'

This branch contains some hacks so that Git produces less CR, and then
some tests.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

git-am.sh

@@ -185,7 +185,9 @@ It does not apply to blobs recorded in its index.")"
 }
 
 clean_abort () {
-	test $# = 0 || echo >&2 "$@"
+	test $# = 0 || cat >&2 <<EOF
+$@
+EOF
 	rm -fr "$dotest"
 	exit 1
 }

git-merge-octopus.sh

@@ -71,7 +71,9 @@ do
 
 	case "$LF$common$LF" in
 	*"$LF$SHA1$LF"*)
-		echo "Already up-to-date with $pretty_name"
+		cat << EOF
+Already up-to-date with $pretty_name
+EOF
 		continue
 		;;
 	esac
@@ -83,15 +85,19 @@ do
 		# tree as the intermediate result of the merge.
 		# We still need to count this as part of the parent set.
 
-		echo "Fast-forwarding to: $pretty_name"
+		cat << EOF
+Fast-forwarding to: $pretty_name
+EOF
 		git read-tree -u -m $head $SHA1 || exit
 		MRC=$SHA1 MRT=$(git write-tree)
 		continue
 	fi
 
 	NON_FF_MERGE=1
 
-	echo "Trying simple merge with $pretty_name"
+	cat << EOF
+Trying simple merge with $pretty_name
+EOF
 	git read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
 	next=$(git write-tree 2>/dev/null)
 	if test $? -ne 0

git-sh-setup.sh

@@ -59,7 +59,9 @@ GIT_QUIET=
 say () {
 	if test -z "$GIT_QUIET"
 	then
-		printf '%s\n' "$*"
+		cat <<EOF
+$*
+EOF
 	fi
 }
 

git-submodule.sh

@@ -434,9 +434,11 @@ cmd_add()
 
 	if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
 	then
-		eval_gettextln "The following path is ignored by one of your .gitignore files:
-\$sm_path
-Use -f if you really want to add it." >&2
+		cat >&2 <<EOF
+The following path is ignored by one of your .gitignore files:
+$(eval_gettextln $sm_path)
+Use -f if you really want to add it.
+EOF
 		exit 1
 	fi