diff options
| author | Danny Lin <danny0838@gmail.com> | 2015-05-08 08:56:59 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-08 12:09:38 -0700 |
| commit | 2ded109b51878fb0bc131945676c90f1d1051213 (patch) | |
| tree | d4edcd771a31b45c20f1c1956a2f74b5a7e46519 | |
| parent | 16018ae5fb368151f3eff13730cf089b63f41962 (diff) | |
| download | git-dl/subtree-avoid-tricky-echo.tar.gz | |
contrib/subtree: portability fix for string printingdl/subtree-avoid-tricky-echo
'echo -n' is not portable, but this script used it as a way to give
a string followed by a carriage return for progress messages.
Introduce a new helper shell function "progress" and use printf as a
more portable way to do this. As a side effect, this makes it
unnecessary to have a raw CR in our source, which can be munged in
some shells. For example, MsysGit trims CR before executing a shell
script file in order to make it work right on Windows even if it
uses CRLF as linefeeds.
While at it, replace "echo" using printf in debug() and say() to
eliminate the temptation of reintroducing the same bug.
Signed-off-by: Danny Lin <danny0838@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/subtree/git-subtree.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index fa1a5839af..d4dae7ab5b 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -51,14 +51,21 @@ prefix= debug() { if [ -n "$debug" ]; then - echo "$@" >&2 + printf "%s\n" "$*" >&2 fi } say() { if [ -z "$quiet" ]; then - echo "$@" >&2 + printf "%s\n" "$*" >&2 + fi +} + +progress() +{ + if [ -z "$quiet" ]; then + printf "%s\r" "$*" >&2 fi } @@ -599,7 +606,7 @@ cmd_split() eval "$grl" | while read rev parents; do revcount=$(($revcount + 1)) - say -n "$revcount/$revmax ($createcount)
" + progress "$revcount/$revmax ($createcount)" debug "Processing commit: $rev" exists=$(cache_get $rev) if [ -n "$exists" ]; then |