undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-submodule.sh: use "$quiet", not "$GIT_QUIET"

Browse Source 
Remove the use of the "$GIT_QUIET" variable in favor of our own
"$quiet", ever since b3c5f5cb04 (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. Now it's obvious that we only care about
passing "--quiet" to "git submodule--helper", and not to change the
output of any "say" invocation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-06-28 12:05:33 +02:00 committed by Junio C Hamano
parent b788fc671b
commit 2eec463739
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
git-submodule.sh
View File

@ -30,6 +30,7 @@ GIT_PROTOCOL_FROM_USER=0
export GIT_PROTOCOL_FROM_USER export GIT_PROTOCOL_FROM_USER
command= command=
quiet=
branch= branch=
force= force=
reference= reference=
@ -80,7 +81,7 @@ cmd_add()
force=$1 force=$1
;; ;;
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--progress) --progress)
progress=1 progress=1
@ -128,7 +129,7 @@ cmd_add()
usage usage
fi fi
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper add ${GIT_QUIET:+--quiet} ${force:+--force} ${progress:+"--progress"} ${branch:+--branch "$branch"} ${reference_path:+--reference "$reference_path"} ${dissociate:+--dissociate} ${custom_name:+--name "$custom_name"} ${depth:+"$depth"} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper add ${quiet:+--quiet} ${force:+--force} ${progress:+"--progress"} ${branch:+--branch "$branch"} ${reference_path:+--reference "$reference_path"} ${dissociate:+--dissociate} ${custom_name:+--name "$custom_name"} ${depth:+"$depth"} -- "$@"
} }
# #
@ -144,7 +145,7 @@ cmd_foreach()
do do
case "$1" in case "$1" in
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--recursive) --recursive)
recursive=1 recursive=1
@ -159,7 +160,7 @@ cmd_foreach()
shift shift
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper foreach ${quiet:+--quiet} ${recursive:+--recursive} -- "$@"
} }
# #
@ -174,7 +175,7 @@ cmd_init()
do do
case "$1" in case "$1" in
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--) --)
shift shift
@ -190,7 +191,7 @@ cmd_init()
shift shift
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper init ${GIT_QUIET:+--quiet} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper init ${quiet:+--quiet} -- "$@"
} }
# #
@ -207,7 +208,7 @@ cmd_deinit()
force=$1 force=$1
;; ;;
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--all) --all)
deinit_all=t deinit_all=t
@ -226,7 +227,7 @@ cmd_deinit()
shift shift
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${force:+--force} ${deinit_all:+--all} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${quiet:+--quiet} ${force:+--force} ${deinit_all:+--all} -- "$@"
} }
# #
@ -241,7 +242,7 @@ cmd_update()
do do
case "$1" in case "$1" in
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--progress) --progress)
progress=1 progress=1
@ -335,7 +336,7 @@ cmd_update()
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper update \ git ${wt_prefix:+-C "$wt_prefix"} submodule--helper update \
${GIT_QUIET:+--quiet} \ ${quiet:+--quiet} \
${force:+--force} \ ${force:+--force} \
${progress:+"--progress"} \ ${progress:+"--progress"} \
${remote:+--remote} \ ${remote:+--remote} \
@ -396,7 +397,7 @@ cmd_set_branch() {
shift shift
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-branch ${GIT_QUIET:+--quiet} ${branch:+--branch "$branch"} ${default:+--default} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-branch ${quiet:+--quiet} ${branch:+--branch "$branch"} ${default:+--default} -- "$@"
} }
# #
@ -409,7 +410,7 @@ cmd_set_url() {
do do
case "$1" in case "$1" in
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--) --)
shift shift
@ -425,7 +426,7 @@ cmd_set_url() {
shift shift
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-url ${GIT_QUIET:+--quiet} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-url ${quiet:+--quiet} -- "$@"
} }
# #
@ -496,7 +497,7 @@ cmd_status()
do do
case "$1" in case "$1" in
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--cached) --cached)
cached=1 cached=1
@ -518,7 +519,7 @@ cmd_status()
shift shift
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper status ${quiet:+--quiet} ${cached:+--cached} ${recursive:+--recursive} -- "$@"
} }
# #
# Sync remote urls for submodules # Sync remote urls for submodules
@ -531,7 +532,7 @@ cmd_sync()
do do
case "$1" in case "$1" in
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
shift shift
;; ;;
--recursive) --recursive)
@ -551,7 +552,7 @@ cmd_sync()
esac esac
done done
git ${wt_prefix:+-C "$wt_prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@" git ${wt_prefix:+-C "$wt_prefix"} submodule--helper sync ${quiet:+--quiet} ${recursive:+--recursive} -- "$@"
} }
cmd_absorbgitdirs() cmd_absorbgitdirs()
@ -572,7 +573,7 @@ do
command=$1 command=$1
;; ;;
-q|--quiet) -q|--quiet)
GIT_QUIET=1 quiet=1
;; ;;
--cached) --cached)
cached=1 cached=1