git-sh-setup.sh: remove "say" function, change last users

Remove the "say" function, with various rewrites of the remaining
git-*.sh code to C and the preceding change to have git-submodule.sh
stop using the GIT_QUIET variable there were only four uses in
git-subtree.sh. Let's have it use an "arg_quiet" variable instead, and
move the "say" function over to it.

The only other use was a trivial message in git-instaweb.sh, since it
has never supported the --quiet option (or similar) that code added in
0b624b4ceee (instaweb: restart server if already running, 2009-11-22)
can simply use "echo" instead.

The remaining in-tree hits from "say" are all for the sibling function
defined in t/test-lib.sh. It's safe to remove this function since it
has never been documented in Documentation/git-sh-setup.txt.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 1af1d9653e94b39623f8435957c6e7537c41c60a..7562a395c2456bf4588a26e6fa847cced5bb71c2 100755 (executable)
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -50,6 +50,14 @@ m,message=    use the given message as the commit message for the merge commit
 
 indent=0
 
+# Usage: say [MSG...]
+say () {
+       if test -z "$arg_quiet"
+       then
+               printf '%s\n' "$*"
+       fi
+}
+
 # Usage: debug [MSG...]
 debug () {
        if test -n "$arg_debug"
@@ -60,7 +68,7 @@ debug () {
 
 # Usage: progress [MSG...]
 progress () {
-       if test -z "$GIT_QUIET"
+       if test -z "$arg_quiet"
        then
                if test -z "$arg_debug"
                then
@@ -146,6 +154,7 @@ main () {
        eval "$set_args"
 
        # Begin "real" flag parsing.
+       arg_quiet=
        arg_debug=
        arg_prefix=
        arg_split_branch=
@@ -161,7 +170,7 @@ main () {
 
                case "$opt" in
                -q)
-                       GIT_QUIET=1
+                       arg_quiet=1
                        ;;
                -d)
                        arg_debug=1
@@ -252,7 +261,7 @@ main () {
        dir="$(dirname "$arg_prefix/.")"
 
        debug "command: {$arg_command}"
-       debug "quiet: {$GIT_QUIET}"
+       debug "quiet: {$arg_quiet}"
        debug "dir: {$dir}"
        debug "opts: {$*}"
        debug

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 4349566c89163ea21dfb8388f494cdcdf86604c9..c68f49454cd83f48ce3452df178766606effbad9 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -102,7 +102,7 @@ resolve_full_httpd () {
 
 start_httpd () {
        if test -f "$fqgitdir/pid"; then
-               say "Instance already running. Restarting..."
+               echo "Instance already running. Restarting..."
                stop_httpd
        fi
 

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index ecb60d9e3cbddbe46c44f68046a4c36ecc9745ab..ce273fe0e48d997cb067e77707026616a9302eb2 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -57,15 +57,6 @@ die_with_status () {
        exit "$status"
 }
 
-GIT_QUIET=
-
-say () {
-       if test -z "$GIT_QUIET"
-       then
-               printf '%s\n' "$*"
-       fi
-}
-
 if test -n "$OPTIONS_SPEC"; then
        usage() {
                "$0" -h