global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 14:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

submodule: Fix t7400, t7405, t7406 for msysGit

Browse Source 
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).
This commit is contained in:
Sebastian Schuberth
2011-04-28 00:30:49 +02:00
parent 599f5058a0
commit f33946d98d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-sh-setup.sh
View File

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

8
git-submodule.sh
View File

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