From f04ea19d2bd2c46fd8b9cdb8a1a7f504e815f4b6 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Thu, 28 Apr 2011 00:30:49 +0200
Subject: [PATCH 1/3] submodule: Fix t7400, t7405, t7406 for msysGit

Again, avoid using echo (which issues DOS line endings on msysGit) to not mix
with Unix line-endings issued by git built-ins, even if this is at the cost of
calling an external executable (cat) instead of a shell built-in (echo).
---
 git-sh-setup.sh  | 4 +++-
 git-submodule.sh | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index c42c6e6365..9cd1ed686d 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -59,7 +59,9 @@ GIT_QUIET=
 say () {
 	if test -z "$GIT_QUIET"
 	then
-		printf '%s\n' "$*"
+		cat <<EOF
+$*
+EOF
 	fi
 }
 
diff --git a/git-submodule.sh b/git-submodule.sh
index 36797c3c00..53ef3d2665 100755
--- a/git-submodule.sh
+++ b/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
 

From a37933fd3d1e9e9a4872db5ceadc47fb17a6b578 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Fri, 23 Mar 2012 10:58:37 +0100
Subject: [PATCH 2/3] 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 <sschuberth@gmail.com>
---
 git-am.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-am.sh b/git-am.sh
index a67d0f9898..2aa0392c47 100755
--- a/git-am.sh
+++ b/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
 }

From 5564a982b4eb23ca8a36c489061b8455c14a945b Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 9 Apr 2012 21:09:49 -0500
Subject: [PATCH 3/3] Windows: make sure that merge-octopus only outputs LF
 line endings

This happens to shut up t7602 on Windows which would otherwise take
the different line endings for a sign that the merge failed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-merge-octopus.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 8643f74cb0..2226eeba99 100755
--- a/git-merge-octopus.sh
+++ b/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,7 +85,9 @@ 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
@@ -91,7 +95,9 @@ do
 
 	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