mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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).
This commit is contained in:
parent
6ae3abf159
commit
dcd8edea1d
|
@ -55,7 +55,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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -264,9 +264,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
|
||||||
eval_gettextln "The following path is ignored by one of your .gitignore files:
|
cat >&2 <<EOF
|
||||||
\$path
|
The following path is ignored by one of your .gitignore files:
|
||||||
Use -f if you really want to add it." >&2
|
$(eval_gettextln $path)
|
||||||
|
Use -f if you really want to add it.
|
||||||
|
EOF
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue