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

Commit 69d482f

Browse files
sschuberthkasal
authored andcommitted
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).
1 parent ec765f6 commit 69d482f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

git-sh-setup.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ GIT_QUIET=
5959
say () {
6060
if test -z "$GIT_QUIET"
6161
then
62-
printf '%s\n' "$*"
62+
cat <<EOF
63+
$*
64+
EOF
6365
fi
6466
}
6567

git-submodule.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,11 @@ cmd_add()
437437

438438
if test -z "$force" && ! git add --dry-run --ignore-missing "$sm_path" > /dev/null 2>&1
439439
then
440-
eval_gettextln "The following path is ignored by one of your .gitignore files:
441-
\$sm_path
442-
Use -f if you really want to add it." >&2
440+
cat >&2 <<EOF
441+
The following path is ignored by one of your .gitignore files:
442+
$(eval_gettextln $sm_path)
443+
Use -f if you really want to add it.
444+
EOF
443445
exit 1
444446
fi
445447

0 commit comments

Comments
 (0)