Skip to content

Commit

Permalink
Supplant the "while case ... break ;; esac" idiom
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Kastrup authored and Junio C Hamano committed Sep 23, 2007
1 parent b9fc6ea commit 822f7c7
Show file tree
Hide file tree
Showing 19 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion contrib/examples/git-gc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion contrib/examples/git-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ username=
list=
verify=
LINES=0
while case "$#" in 0) break ;; esac
while test $# != 0
do
case "$1" in
-a)
Expand Down
2 changes: 1 addition & 1 deletion contrib/examples/git-verify-tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=*)
Expand Down
2 changes: 1 addition & 1 deletion git-clean.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion git-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion git-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion git-filter-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion git-instaweb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion git-ls-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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|\
Expand Down
2 changes: 1 addition & 1 deletion git-mergetool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ merge_file () {
cleanup_temp_files
}

while case $# in 0) break ;; esac
while test $# != 0
do
case "$1" in
-t|--tool*)
Expand Down
6 changes: 3 additions & 3 deletions git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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|\
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion git-quiltimport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=*)
Expand Down
2 changes: 1 addition & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ do_rest () {
done
}

while case $# in 0) break ;; esac
while test $# != 0
do
case "$1" in
--continue)
Expand Down
5 changes: 2 additions & 3 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion git-repack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;;
Expand Down
2 changes: 1 addition & 1 deletion git-reset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion git-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ modules_list()
done
}

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

0 comments on commit 822f7c7

Please sign in to comment.