From: Roy Eldar <royeldar0@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Roy Eldar" <royeldar0@gmail.com>
Subject: [PATCH v4 3/7] git-submodule.sh: get rid of isnumber
Date: Wed, 11 Dec 2024 08:32:30 +0200 [thread overview]
Message-ID: <20241211063234.7610-4-royeldar0@gmail.com> (raw)
In-Reply-To: <20241211063234.7610-1-royeldar0@gmail.com>
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>
---
git-submodule.sh | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index fd54cb8fa6..3adaa8d9a3 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -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"} \
-- \
"$@"
}
--
2.30.2
next prev parent reply other threads:[~2024-12-11 6:33 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-07 13:51 [PATCH 0/3] git-submodule.sh: improve parsing of options Roy Eldar
2024-12-07 13:51 ` [PATCH 1/3] git-submodule.sh: make some variables boolean Roy Eldar
2024-12-07 23:43 ` Junio C Hamano
2024-12-08 0:06 ` Eric Sunshine
2024-12-07 13:52 ` [PATCH 2/3] git-submodule.sh: improve parsing of some long options Roy Eldar
2024-12-07 13:52 ` [PATCH 3/3] git-submodule.sh: improve parsing of short options Roy Eldar
2024-12-08 0:02 ` Junio C Hamano
2024-12-09 16:21 ` Roy E
2024-12-09 16:50 ` [PATCH v2 0/8] git-submodule.sh: improve parsing of options Roy Eldar
2024-12-09 16:50 ` [PATCH v2 1/8] git-submodule.sh: make some variables boolean Roy Eldar
2024-12-09 16:50 ` [PATCH v2 2/8] git-submodule.sh: improve parsing of some long options Roy Eldar
2024-12-09 16:50 ` [PATCH v2 3/8] git-submodule.sh: improve parsing of short options Roy Eldar
2024-12-09 16:50 ` [PATCH v2 4/8] git-submodule.sh: get rid of isnumber Roy Eldar
2024-12-09 16:50 ` [PATCH v2 5/8] git-submodule.sh: get rid of unused variable Roy Eldar
2024-12-09 16:50 ` [PATCH v2 6/8] git-submodule.sh: add some comments Roy Eldar
2024-12-09 16:50 ` [PATCH v2 7/8] git-submodule.sh: improve variables readability Roy Eldar
2024-12-09 16:50 ` [PATCH v2 8/8] git-submodule.sh: rename some variables Roy Eldar
2024-12-09 23:26 ` [PATCH v2 0/8] git-submodule.sh: improve parsing of options Junio C Hamano
2024-12-10 0:50 ` Junio C Hamano
2024-12-10 18:11 ` Roy E
2024-12-11 0:02 ` Junio C Hamano
2024-12-11 6:13 ` Roy E
2024-12-11 6:16 ` Junio C Hamano
2024-12-10 18:44 ` [PATCH v3 0/7] " Roy Eldar
2024-12-10 18:44 ` [PATCH v3 1/7] git-submodule.sh: improve parsing of some long options Roy Eldar
2024-12-10 18:44 ` [PATCH v3 2/7] git-submodule.sh: improve parsing of short options Roy Eldar
2024-12-10 18:44 ` [PATCH v3 3/7] git-submodule.sh: get rid of isnumber Roy Eldar
2024-12-10 18:44 ` [PATCH v3 4/7] git-submodule.sh: get rid of unused variable Roy Eldar
2024-12-10 18:44 ` [PATCH v3 5/7] git-submodule.sh: add some comments Roy Eldar
2024-12-10 18:44 ` [PATCH v3 6/7] git-submodule.sh: improve variables readability Roy Eldar
2024-12-11 0:14 ` Junio C Hamano
2024-12-11 6:21 ` Roy E
2024-12-11 1:56 ` Đoàn Trần Công Danh
2024-12-11 6:09 ` Junio C Hamano
2024-12-10 18:44 ` [PATCH v3 7/7] git-submodule.sh: rename some variables Roy Eldar
2024-12-11 6:32 ` [PATCH v4 0/7] git-submodule.sh: improve parsing of options Roy Eldar
2024-12-11 6:32 ` [PATCH v4 1/7] git-submodule.sh: improve parsing of some long options Roy Eldar
2024-12-11 6:32 ` [PATCH v4 2/7] git-submodule.sh: improve parsing of short options Roy Eldar
2024-12-11 6:32 ` Roy Eldar [this message]
2024-12-11 6:32 ` [PATCH v4 4/7] git-submodule.sh: get rid of unused variable Roy Eldar
2024-12-11 6:32 ` [PATCH v4 5/7] git-submodule.sh: add some comments Roy Eldar
2024-12-11 6:32 ` [PATCH v4 6/7] git-submodule.sh: improve variables readability Roy Eldar
2024-12-11 6:32 ` [PATCH v4 7/7] git-submodule.sh: rename some variables Roy Eldar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241211063234.7610-4-royeldar0@gmail.com \
--to=royeldar0@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).