From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elia Pinto Subject: [PATCHv2 10/19] git-submodule.sh: convert test -a/-o to && and || Date: Wed, 21 May 2014 07:24:15 -0700 Message-ID: <1400682255-17616-1-git-send-email-gitter.spiros@gmail.com> Cc: Matthieu.Moy@grenoble-inp.fr, j.sixt@viscovery.net, Elia Pinto To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed May 21 16:24:29 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wn7RT-00067e-CI for gcvg-git-2@plane.gmane.org; Wed, 21 May 2014 16:24:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751962AbaEUOYX (ORCPT ); Wed, 21 May 2014 10:24:23 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:41258 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751145AbaEUOYW (ORCPT ); Wed, 21 May 2014 10:24:22 -0400 Received: by mail-pa0-f41.google.com with SMTP id lj1so1463499pab.28 for ; Wed, 21 May 2014 07:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=SDSlV/NeU7Lj2Ubz70sGt2prEhRUBiMFvSu8eSgTfUA=; b=UUgaIsA/sOBh3JEkQMnK5eTA1kAKYb79N+B5FvvJMU7iySBDz71QhkYr4JqlEv5lWA RXY13kzkpVT0zRszvZbRnkfddVewFYgqP7tp0Yu04aGhP0J9fROz1F1arSx2BUAMF1Lv VnEa9qY9Os4ay+jatlj1gHOXJ+Q9ipbbAKnIFri4e4kL2YpIeBsdOg7A5Q9KvSG5ssz0 lDvg3G/OTm9jgaQWxFyMAAJfYjMmdMJDmDcDh1uvs4lfvcaV2hpf3Nd3LZ0jpY5u/xe/ HZMVLYI3fIHHrBaEPVcU1y9HdhtBZKQHLecnYGnHkL3d/2e8wwBF7wco3FjnmRAq6X5M nMtQ== X-Received: by 10.66.66.72 with SMTP id d8mr60157993pat.8.1400682262111; Wed, 21 May 2014 07:24:22 -0700 (PDT) Received: from devzero2000ubu.nephoscale.com (140.195.207.67.nephoscale.net. [67.207.195.140]) by mx.google.com with ESMTPSA id oa3sm8443653pbb.15.2014.05.21.07.24.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 21 May 2014 07:24:21 -0700 (PDT) X-Mailer: git-send-email 1.7.10.4 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The interaction with unary operators and operator precedence for && and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things. --- This is version 2 of the patch to git-submodule of the patch series "convert test -a/-o to && and ||". It contains the fixes identified by Johannes and Matthieu. 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 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