submodule, repack: migrate to git-sh-setup's say()

Now that there is say() in git-sh-setup, these scripts don't need to use
their own. Migrate them over by setting GIT_QUIET and removing their
custom say() functions.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-repack.sh b/git-repack.sh
index 0868734723b3c96144bfa9360a9e19ebae1995f7..1bf239499c7bdb04622ea6fa239bd7c0ace42065 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -24,7 +24,7 @@ SUBDIRECTORY_OK='Yes'
 . git-sh-setup
 
 no_update_info= all_into_one= remove_redundant= unpack_unreachable=
 . git-sh-setup
 
 no_update_info= all_into_one= remove_redundant= unpack_unreachable=

-local= quiet= no_reuse= extra=
+local= no_reuse= extra=

 while test $# != 0
 do
        case "$1" in
 while test $# != 0
 do
        case "$1" in


@@ -33,7 +33,7 @@ do
        -A)     all_into_one=t
                unpack_unreachable=--unpack-unreachable ;;
        -d)     remove_redundant=t ;;
        -A)     all_into_one=t
                unpack_unreachable=--unpack-unreachable ;;
        -d)     remove_redundant=t ;;

-       -q)     quiet=-q ;;
+       -q)     GIT_QUIET=t ;;

        -f)     no_reuse=--no-reuse-object ;;
        -l)     local=--local ;;
        --max-pack-size|--window|--window-memory|--depth)
        -f)     no_reuse=--no-reuse-object ;;
        -l)     local=--local ;;
        --max-pack-size|--window|--window-memory|--depth)


@@ -80,13 +80,11 @@ case ",$all_into_one," in
        ;;
 esac
 
        ;;
 esac
 

-args="$args $local $quiet $no_reuse$extra"
+args="$args $local ${GIT_QUIET:+-q} $no_reuse$extra"

 names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
        exit 1
 if [ -z "$names" ]; then
 names=$(git pack-objects --honor-pack-keep --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
        exit 1
 if [ -z "$names" ]; then

-       if test -z "$quiet"; then
-               echo Nothing new to pack.
-       fi
+       say Nothing new to pack.

 fi
 
 # Ok we have prepared all new packfiles.
 fi
 
 # Ok we have prepared all new packfiles.


@@ -176,7 +174,7 @@ then
                  done
                )
        fi
                  done
                )
        fi

-       git prune-packed $quiet
+       git prune-packed ${GIT_QUIET:+-q}

 fi
 
 case "$no_update_info" in
 fi
 
 case "$no_update_info" in

diff --git a/git-submodule.sh b/git-submodule.sh
index 19a3a840fdc7eed4994741e13306b71a3ffd2ada..58d2fd2ccb65925e81b1aab3c8e624359b286a14 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -14,23 +14,11 @@ require_work_tree
 
 command=
 branch=
 
 command=
 branch=

-quiet=

 reference=
 cached=
 nofetch=
 update=
 
 reference=
 cached=
 nofetch=
 update=
 

-#
-# print stuff on stdout unless -q was specified
-#
-say()
-{
-       if test -z "$quiet"
-       then
-               echo "$@"
-       fi
-}
-

 # Resolve relative url by appending to parent's url
 resolve_relative_url ()
 {
 # Resolve relative url by appending to parent's url
 resolve_relative_url ()
 {


@@ -137,7 +125,7 @@ cmd_add()
                        shift
                        ;;
                -q|--quiet)
                        shift
                        ;;
                -q|--quiet)

-                       quiet=1
+                       GIT_QUIET=1

                        ;;
                --reference)
                        case "$2" in '') usage ;; esac
                        ;;
                --reference)
                        case "$2" in '') usage ;; esac


@@ -273,7 +261,7 @@ cmd_init()
        do
                case "$1" in
                -q|--quiet)
        do
                case "$1" in
                -q|--quiet)

-                       quiet=1
+                       GIT_QUIET=1

                        ;;
                --)
                        shift
                        ;;
                --)
                        shift


@@ -333,7 +321,7 @@ cmd_update()
                case "$1" in
                -q|--quiet)
                        shift
                case "$1" in
                -q|--quiet)
                        shift

-                       quiet=1
+                       GIT_QUIET=1

                        ;;
                -i|--init)
                        init=1
                        ;;
                -i|--init)
                        init=1


@@ -650,7 +638,7 @@ cmd_status()
        do
                case "$1" in
                -q|--quiet)
        do
                case "$1" in
                -q|--quiet)

-                       quiet=1
+                       GIT_QUIET=1

                        ;;
                --cached)
                        cached=1
                        ;;
                --cached)
                        cached=1


@@ -704,7 +692,7 @@ cmd_sync()
        do
                case "$1" in
                -q|--quiet)
        do
                case "$1" in
                -q|--quiet)

-                       quiet=1
+                       GIT_QUIET=1

                        shift
                        ;;
                --)
                        shift
                        ;;
                --)


@@ -759,7 +747,7 @@ do
                command=$1
                ;;
        -q|--quiet)
                command=$1
                ;;
        -q|--quiet)

-               quiet=1
+               GIT_QUIET=1

                ;;
        -b|--branch)
                case "$2" in
                ;;
        -b|--branch)
                case "$2" in