[RFC PATCH 17/20] git-submodule.sh: use "$quiet", not "$GIT_QUIET"
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jun 10, 2022, 02:01 UTC
- Message-ID
- <RFC-patch-17.20-59a72296967-20220610T011725Z-avarab@gmail.com>
- In-Reply-To
- <RFC-cover-00.20-00000000000-20220610T011725Z-avarab@gmail.com>
Remove the use of the "$GIT_QUIET" variable in favor of our own "$quiet", ever since b3c5f5cb048 (submodule: move core cmd_update() logic to C, 2022-03-15) we have not used the "say" function in git-sh-setup.sh, which is the only thing that's affected by using "GIT_QUIET".
We still want to support --quiet for our own use though, but let's use our own variable for that.
This change could have come before the preceding commits which removed cmd_*() functions from this file, but that would have been a much more verbose change. Since we were removing most of the uses of "$GIT_QUIET" this change comes after those.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- git-submodule.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index e245b7fbaca..cad9948c047 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -30,6 +30,7 @@ GIT_PROTOCOL_FROM_USER=0 export GIT_PROTOCOL_FROM_USER command= +quiet= cached= while test $# != 0 && test -z "$command" @@ -39,7 +40,7 @@ do command=$1 ;; -q|--quiet) - GIT_QUIET=1 + quiet=1 ;; --cached) cached=1 @@ -80,10 +81,10 @@ absorbgitdirs) ;; update) git ${wt_prefix:+-C "$wt_prefix"} submodule--helper "$command" \ - ${GIT_QUIET:+--quiet} ${wt_prefix:+--prefix "$wt_prefix"} "$@" + ${quiet:+--quiet} ${wt_prefix:+--prefix "$wt_prefix"} "$@" ;; add | foreach | init | deinit | set-branch | set-url | status | summary | sync) git ${wt_prefix:+-C "$wt_prefix"} submodule--helper "$command" \ - ${GIT_QUIET:+--quiet} ${cached:+--cached} "$@" + ${quiet:+--quiet} ${cached:+--cached} "$@" ;; esac
-- 2.36.1.1178.gb5b1747c546