Browse Source

Supplant the "while case ... break ;; esac" idiom

A lot of shell scripts contained stuff starting with

	while case "$#" in 0) break ;; esac

and similar.  I consider breaking out of the condition instead of the
body od the loop ugly, and the implied "true" value of the
non-matching case is not really obvious to humans at first glance.  It
happens not to be obvious to some BSD shells, either, but that's
because they are not POSIX-compliant.  In most cases, this has been
replaced by a straight condition using "test".  "case" has the
advantage of being faster than "test" on vintage shells where "test"
is not a builtin.  Since none of them is likely to run the git
scripts, anyway, the added readability should be worth the change.

A few loops have had their termination condition expressed
differently.

Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
David Kastrup 18 years ago committed by Junio C Hamano
parent
commit
822f7c7349
  1. 2
      contrib/examples/git-gc.sh
  2. 2
      contrib/examples/git-tag.sh
  3. 2
      contrib/examples/git-verify-tag.sh
  4. 2
      git-am.sh
  5. 2
      git-clean.sh
  6. 2
      git-commit.sh
  7. 2
      git-fetch.sh
  8. 3
      git-filter-branch.sh
  9. 2
      git-instaweb.sh
  10. 2
      git-ls-remote.sh
  11. 2
      git-merge.sh
  12. 2
      git-mergetool.sh
  13. 6
      git-pull.sh
  14. 2
      git-quiltimport.sh
  15. 2
      git-rebase--interactive.sh
  16. 5
      git-rebase.sh
  17. 2
      git-repack.sh
  18. 2
      git-reset.sh
  19. 2
      git-submodule.sh

2
contrib/examples/git-gc.sh

@ -9,7 +9,7 @@ SUBDIRECTORY_OK=Yes @@ -9,7 +9,7 @@ SUBDIRECTORY_OK=Yes
. git-sh-setup

no_prune=:
while case $# in 0) break ;; esac
while test $# != 0
do
case "$1" in
--prune)

2
contrib/examples/git-tag.sh

@ -14,7 +14,7 @@ username= @@ -14,7 +14,7 @@ username=
list=
verify=
LINES=0
while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
-a)

2
contrib/examples/git-verify-tag.sh

@ -5,7 +5,7 @@ SUBDIRECTORY_OK='Yes' @@ -5,7 +5,7 @@ SUBDIRECTORY_OK='Yes'
. git-sh-setup

verbose=
while case $# in 0) break;; esac
while test $# != 0
do
case "$1" in
-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)

2
git-am.sh

@ -109,7 +109,7 @@ dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= @@ -109,7 +109,7 @@ dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary=
resolvemsg= resume=
git_apply_opt=

while case "$#" in 0) break;; esac
while test $# != 0
do
case "$1" in
-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)

2
git-clean.sh

@ -26,7 +26,7 @@ rmrf="rm -rf --" @@ -26,7 +26,7 @@ rmrf="rm -rf --"
rm_refuse="echo Not removing"
echo1="echo"

while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
-d)

2
git-commit.sh

@ -89,7 +89,7 @@ force_author= @@ -89,7 +89,7 @@ force_author=
only_include_assumed=
untracked_files=
templatefile="`git config commit.template`"
while case "$#" in 0) break;; esac
while test $# != 0
do
case "$1" in
-F|--F|-f|--f|--fi|--fil|--file)

2
git-fetch.sh

@ -27,7 +27,7 @@ shallow_depth= @@ -27,7 +27,7 @@ shallow_depth=
no_progress=
test -t 1 || no_progress=--no-progress
quiet=
while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
-a|--a|--ap|--app|--appe|--appen|--append)

3
git-filter-branch.sh

@ -105,8 +105,9 @@ filter_tag_name= @@ -105,8 +105,9 @@ filter_tag_name=
filter_subdir=
orig_namespace=refs/original/
force=
while case "$#" in 0) usage;; esac
while :
do
test $# = 0 && usage
case "$1" in
--)
shift

2
git-instaweb.sh

@ -61,7 +61,7 @@ stop_httpd () { @@ -61,7 +61,7 @@ stop_httpd () {
test -f "$fqgitdir/pid" && kill `cat "$fqgitdir/pid"`
}

while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
--stop|stop)

2
git-ls-remote.sh

@ -13,7 +13,7 @@ die () { @@ -13,7 +13,7 @@ die () {
}

exec=
while case "$#" in 0) break;; esac
while test $# != 0
do
case "$1" in
-h|--h|--he|--hea|--head|--heads)

2
git-merge.sh

@ -122,7 +122,7 @@ merge_name () { @@ -122,7 +122,7 @@ merge_name () {
case "$#" in 0) usage ;; esac

have_message=
while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\

2
git-mergetool.sh

@ -268,7 +268,7 @@ merge_file () { @@ -268,7 +268,7 @@ merge_file () {
cleanup_temp_files
}

while case $# in 0) break ;; esac
while test $# != 0
do
case "$1" in
-t|--tool*)

6
git-pull.sh

@ -16,7 +16,7 @@ test -z "$(git ls-files -u)" || @@ -16,7 +16,7 @@ test -z "$(git ls-files -u)" ||
die "You are in the middle of a conflicted merge."

strategy_args= no_summary= no_commit= squash=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
while :
do
case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
@ -46,8 +46,8 @@ do @@ -46,8 +46,8 @@ do
-h|--h|--he|--hel|--help)
usage
;;
-*)
# Pass thru anything that is meant for fetch.
*)
# Pass thru anything that may be meant for fetch.
break
;;
esac

2
git-quiltimport.sh

@ -5,7 +5,7 @@ SUBDIRECTORY_ON=Yes @@ -5,7 +5,7 @@ SUBDIRECTORY_ON=Yes

dry_run=""
quilt_author=""
while case "$#" in 0) break;; esac
while test $# != 0
do
case "$1" in
--au=*|--aut=*|--auth=*|--autho=*|--author=*)

2
git-rebase--interactive.sh

@ -317,7 +317,7 @@ do_rest () { @@ -317,7 +317,7 @@ do_rest () {
done
}

while case $# in 0) break ;; esac
while test $# != 0
do
case "$1" in
--continue)

5
git-rebase.sh

@ -122,15 +122,14 @@ finish_rb_merge () { @@ -122,15 +122,14 @@ finish_rb_merge () {

is_interactive () {
test -f "$dotest"/interactive ||
while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
do
while :; do case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
shift
done && test -n "$1"
}

is_interactive "$@" && exec git-rebase--interactive "$@"

while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
--continue)

2
git-repack.sh

@ -9,7 +9,7 @@ SUBDIRECTORY_OK='Yes' @@ -9,7 +9,7 @@ SUBDIRECTORY_OK='Yes'

no_update_info= all_into_one= remove_redundant=
local= quiet= no_reuse= extra=
while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
-n) no_update_info=t ;;

2
git-reset.sh

@ -11,7 +11,7 @@ require_work_tree @@ -11,7 +11,7 @@ require_work_tree
update= reset_type=--mixed
unset rev

while case $# in 0) break ;; esac
while test $# != 0
do
case "$1" in
--mixed | --soft | --hard)

2
git-submodule.sh

@ -251,7 +251,7 @@ modules_list() @@ -251,7 +251,7 @@ modules_list()
done
}

while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
add)

Loading…
Cancel
Save