Junio C Hamano wrote:
>> Uwe Storbeck wrote:
>>> + printf '%s\n' "$@" | sed -e 's/^/# /'
>
> This is wrong, isn't it? Why do we want one line per item here?
Yes, Hannes caught the same, too. Sorry for the sloppiness.
We currently use "echo" all over the place (e.g., 'echo "$path"' in
git-sh-setup), and every time we fix it there is a chance of making
mistakes. I wonder if it would make sense to add a helper to make the
echo calls easier to replace:
-- >8 --
Subject: git-sh-setup: introduce sane_echo helper
Using 'echo' with arguments that might contain backslashes or "-e" or
"-n" can produce confusing results that vary from platform to platform
(e.g., dash always interprets \ escape sequences and echoes "-e"
verbatim, whereas bash does not interpret \ escapes unless "-e" is
passed as an argument to echo and suppresses the "-e" from its
output).
Instead, we should use printf, which is more predictable:
printf '%s\n' "$foo"; # Just prints $foo, on all platforms.
Blindly replacing echo with "printf '%s\n'" would not be good enough
because that printf prints each argument on its own line. Provide a
sane_echo helper that prints its arguments, space-delimited, on a
single line, to make this easier to remember, and tweak 'say'
and 'die_with_status' to illustrate how it is used.
No functional change intended.
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
git-sh-setup.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git i/git-sh-setup.sh w/git-sh-setup.sh
index 256c89a..f35b5b9 100644
--- i/git-sh-setup.sh
+++ w/git-sh-setup.sh
@@ -43,6 +43,10 @@ git_broken_path_fix () {
# @@BROKEN_PATH_FIX@@
+sane_echo () {
+ printf '%s\n' "$*"
+}
+
die () {
die_with_status 1 "$@"
}
@@ -50,7 +54,7 @@ die () {
die_with_status () {
status=$1
shift
- printf >&2 '%s\n' "$*"
+ sane_echo >&2 "$*"
exit "$status"
}
@@ -59,7 +63,7 @@ GIT_QUIET=
say () {
if test -z "$GIT_QUIET"
then
- printf '%s\n' "$*"
+ sane_echo "$*"
fi
}
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html