From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 10/20] git-submodule.sh: avoid "test <cond> -a/-o <cond>"
Date: Fri, 6 Jun 2014 07:55:53 -0700 [thread overview]
Message-ID: <1402066563-28519-11-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1402066563-28519-1-git-send-email-gitter.spiros@gmail.com>
The construct is error-prone; "test" being built-in in most modern
shells, the reason to avoid "test <cond> && test <cond>" spawning
one extra process by using a single "test <cond> -a <cond>" no
longer exists.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
git-submodule.sh | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index b55d83a..1e3a5a6 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -396,7 +396,7 @@ cmd_add()
sed -e 's|/$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
fi
- if test -z "$repo" -o -z "$sm_path"; then
+ if test -z "$repo" || test -z "$sm_path"; then
usage
fi
@@ -453,7 +453,7 @@ Use -f if you really want to add it." >&2
# perhaps the path exists and is already a git repo, else clone it
if test -e "$sm_path"
then
- if test -d "$sm_path"/.git -o -f "$sm_path"/.git
+ if test -d "$sm_path"/.git || test -f "$sm_path"/.git
then
eval_gettextln "Adding existing repo at '\$sm_path' to the index"
else
@@ -835,7 +835,7 @@ Maybe you want to use 'update --init'?")"
continue
fi
- if ! test -d "$sm_path"/.git -o -f "$sm_path"/.git
+ if ! test -d "$sm_path"/.git || test -f "$sm_path"/.git
then
module_clone "$sm_path" "$name" "$url" "$reference" "$depth" || exit
cloned_modules="$cloned_modules;$name"
@@ -860,11 +860,11 @@ Maybe you want to use 'update --init'?")"
die "$(eval_gettext "Unable to find current ${remote_name}/${branch} revision in submodule path '\$sm_path'")"
fi
- if test "$subsha1" != "$sha1" -o -n "$force"
+ if test "$subsha1" != "$sha1" || test -n "$force"
then
subforce=$force
# If we don't already have a -f flag and the submodule has never been checked out
- if test -z "$subsha1" -a -z "$force"
+ if test -z "$subsha1" && test -z "$force"
then
subforce="-f"
fi
@@ -1034,7 +1034,7 @@ cmd_summary() {
then
head=$rev
test $# = 0 || shift
- elif test -z "$1" -o "$1" = "HEAD"
+ elif test -z "$1" || test "$1" = "HEAD"
then
# before the first commit: compare with an empty tree
head=$(git hash-object -w -t tree --stdin </dev/null)
@@ -1059,13 +1059,17 @@ cmd_summary() {
while read mod_src mod_dst sha1_src sha1_dst status sm_path
do
# Always show modules deleted or type-changed (blob<->module)
- test $status = D -o $status = T && echo "$sm_path" && continue
+ case "$status" in
+ [DT])
+ printf '%s\n' "$sm_path" &&
+ continue
+ esac
# Respect the ignore setting for --for-status.
if test -n "$for_status"
then
name=$(module_name "$sm_path")
ignore_config=$(get_submodule_config "$name" ignore none)
- test $status != A -a $ignore_config = all && continue
+ test $status != A && test $ignore_config = all && continue
fi
# Also show added or modified modules which are checked out
GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
@@ -1125,7 +1129,7 @@ cmd_summary() {
*)
errmsg=
total_commits=$(
- if test $mod_src = 160000 -a $mod_dst = 160000
+ if test $mod_src = 160000 && test $mod_dst = 160000
then
range="$sha1_src...$sha1_dst"
elif test $mod_src = 160000
@@ -1162,7 +1166,7 @@ cmd_summary() {
# i.e. deleted or changed to blob
test $mod_dst = 160000 && echo "$errmsg"
else
- if test $mod_src = 160000 -a $mod_dst = 160000
+ if test $mod_src = 160000 && test $mod_dst = 160000
then
limit=
test $summary_limit -gt 0 && limit="-$summary_limit"
@@ -1233,7 +1237,11 @@ cmd_status()
say "U$sha1 $displaypath"
continue
fi
- if test -z "$url" || ! test -d "$sm_path"/.git -o -f "$sm_path"/.git
+ if test -z "$url" ||
+ {
+ ! test -d "$sm_path"/.git &&
+ ! test -f "$sm_path"/.git
+ }
then
say "-$sha1 $displaypath"
continue;
@@ -1402,7 +1410,7 @@ then
fi
# "--cached" is accepted only by "status" and "summary"
-if test -n "$cached" && test "$command" != status -a "$command" != summary
+if test -n "$cached" && test "$command" != status && test "$command" != summary
then
usage
fi
--
1.7.10.4
next prev parent reply other threads:[~2014-06-06 14:56 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 14:55 [PATCH 00/20] avoid "test <cond> -a/-o <cond>" Elia Pinto
2014-06-06 14:55 ` [PATCH 01/20] check_bindir: " Elia Pinto
2014-06-06 14:55 ` [PATCH 02/20] contrib/examples/git-clone.sh: " Elia Pinto
2014-06-09 23:23 ` Junio C Hamano
2014-06-06 14:55 ` [PATCH 03/20] contrib/examples/git-commit.sh: " Elia Pinto
2014-06-10 18:36 ` David Aguilar
2014-06-06 14:55 ` [PATCH 04/20] contrib/examples/git-merge.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 05/20] contrib/examples/git-repack.sh: " Elia Pinto
2014-06-10 18:39 ` David Aguilar
2014-06-06 14:55 ` [PATCH 06/20] contrib/examples/git-resolve.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 07/20] git-bisect.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 08/20] git-mergetool.sh: " Elia Pinto
2014-06-10 7:37 ` David Aguilar
2014-06-06 14:55 ` [PATCH 09/20] git-rebase--interactive.sh: " Elia Pinto
2014-06-10 18:43 ` David Aguilar
2014-06-06 14:55 ` Elia Pinto [this message]
2014-06-09 23:23 ` [PATCH 10/20] git-submodule.sh: " Junio C Hamano
2014-06-10 6:52 ` Johannes Sixt
2014-06-10 8:19 ` Johannes Sixt
2014-06-06 14:55 ` [PATCH 11/20] t/lib-httpd.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 12/20] t/t0025-crlf-auto.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 13/20] t/t0026-eol-config.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 14/20] t/t4102-apply-rename.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 15/20] t/t5000-tar-tree.sh: " Elia Pinto
2014-06-10 18:49 ` David Aguilar
2014-06-10 19:21 ` David Aguilar
2014-06-10 20:08 ` David Aguilar
2014-06-10 21:47 ` René Scharfe
2014-06-06 14:55 ` [PATCH 16/20] t/t5403-post-checkout-hook.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 17/20] t/t5538-push-shallow.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 18/20] t/t9814-git-p4-rename.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 19/20] t/test-lib-functions.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 20/20] CodingGuidelines: " Elia Pinto
2014-06-06 19:04 ` Torsten Bögershausen
2014-06-09 13:31 ` [PATCH 00/20] " Matthieu Moy
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=1402066563-28519-11-git-send-email-gitter.spiros@gmail.com \
--to=gitter.spiros@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.