From 765be52368c2e8073b3d28f134a0d10d040ffb8d Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Thu, 28 Apr 2011 00:30:49 +0200
Subject: [PATCH] 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 5d8e4e6c89..d9fc4be050 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -55,7 +55,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 5bec652114..dccd0f663a 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -265,9 +265,11 @@ cmd_add()
 
 	if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
 	then
-		eval_gettextln "The following path is ignored by one of your .gitignore files:
-\$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 $path)
+Use -f if you really want to add it.
+EOF
 		exit 1
 	fi
 
-- 
2.11.4.GIT