git-submodule.sh: get rid of isnumber
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>
This commit is contained in:

committed by
Junio C Hamano

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