]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-submodule.sh: get rid of isnumber
authorRoy Eldar <royeldar0@gmail.com>
Wed, 11 Dec 2024 06:32:30 +0000 (08:32 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Dec 2024 11:46:47 +0000 (20:46 +0900)
It's entirely unnecessary to check whether the argument given to an
option (i.e. --summary-limit) is valid in the shell wrapper, since it's
already done when parsing the various options in git-submodule--helper.

Remove this check from the script; this both improves consistency
throughout the script, and the error message shown to the user in case
some invalid non-numeric argument was passed to "--summary-limit" is
more informative as well.

Signed-off-by: Roy Eldar <royeldar0@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-submodule.sh

index fd54cb8fa6a7efde349d61dbb32867b02c28bdef..3adaa8d9a3fe0929b947af29d70ab986f6deafdd 100755 (executable)
@@ -53,11 +53,6 @@ jobs=
 recommend_shallow=
 filter=
 
-isnumber()
-{
-       n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
-}
-
 #
 # Add a new submodule to the working tree, .gitmodules and the index
 #
@@ -524,17 +519,15 @@ cmd_summary() {
                        for_status="$1"
                        ;;
                -n|--summary-limit)
+                       case "$2" in '') usage ;; esac
                        summary_limit="$2"
-                       isnumber "$summary_limit" || usage
                        shift
                        ;;
                -n*)
                        summary_limit="${1#-n}"
-                       isnumber "$summary_limit" || usage
                        ;;
                --summary-limit=*)
                        summary_limit="${1#--summary-limit=}"
-                       isnumber "$summary_limit" || usage
                        ;;
                --)
                        shift
@@ -554,7 +547,7 @@ cmd_summary() {
                ${files:+--files} \
                ${cached:+--cached} \
                ${for_status:+--for-status} \
-               ${summary_limit:+-n $summary_limit} \
+               ${summary_limit:+-n "$summary_limit"} \
                -- \
                "$@"
 }