From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 06/10] t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
Date: Fri, 8 Jan 2016 12:06:24 +0100 [thread overview]
Message-ID: <1452251188-12939-7-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1452251188-12939-1-git-send-email-gitter.spiros@gmail.com>
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, embedded
command substitutions and/or the use of double quotes require
careful escaping with the backslash character.
The patch was generated by:
for _f in $(find . -name "*.sh")
do
perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}"
done
and then carefully proof-read.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
t/t7602-merge-octopus-many.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 955f09f..6abe441 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
git add c$i.c &&
git commit -m c$i &&
git tag c$i &&
- i=`expr $i + 1` || return 1
+ i=$(expr $i + 1) || return 1
done
'
@@ -30,7 +30,7 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
while test $i -le 30
do
refs="$refs c$i"
- i=`expr $i + 1`
+ i=$(expr $i + 1)
done &&
git merge $refs &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
@@ -38,14 +38,14 @@ test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
while test $i -le 30
do
test "$(git rev-parse c$i)" = "$(git rev-parse HEAD^$i)" &&
- i=`expr $i + 1` || return 1
+ i=$(expr $i + 1) || return 1
done &&
git diff --exit-code &&
i=1 &&
while test $i -le 30
do
test -f c$i.c &&
- i=`expr $i + 1` || return 1
+ i=$(expr $i + 1) || return 1
done
'
--
2.3.3.GIT
next prev parent reply other threads:[~2016-01-08 11:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-08 11:06 [PATCH 00/10] use the $( ... ) construct for command substitution Elia Pinto
2016-01-08 11:06 ` [PATCH 01/10] t/t7103-reset-bare.sh: " Elia Pinto
2016-01-08 11:06 ` [PATCH 02/10] t/t7406-submodule-update.sh: " Elia Pinto
2016-01-08 11:06 ` [PATCH 03/10] t/t7408-submodule-reference.sh: " Elia Pinto
2016-01-08 11:06 ` [PATCH 04/10] t/t7504-commit-msg-hook.sh: " Elia Pinto
2016-01-08 11:06 ` [PATCH 05/10] t/t7505-prepare-commit-msg-hook.sh: " Elia Pinto
2016-01-08 11:06 ` Elia Pinto [this message]
2016-01-08 11:06 ` [PATCH 07/10] t/t7700-repack.sh: " Elia Pinto
2016-01-08 11:06 ` [PATCH 08/10] t/t8003-blame-corner-cases.sh: " Elia Pinto
2016-01-08 11:06 ` [PATCH 09/10] t/t9001-send-email.sh: " Elia Pinto
2016-01-08 11:06 ` [PATCH 10/10] t/t9001-send-email.sh: get rid of unnecessary backquotes Elia Pinto
2016-01-08 14:52 ` Matthieu Moy
2016-01-08 18:12 ` Junio C Hamano
2016-01-08 22:29 ` Elia Pinto
2016-01-08 22:37 ` Junio C Hamano
2016-01-08 23:19 ` Elia Pinto
2016-01-08 20:07 ` Johannes Sixt
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=1452251188-12939-7-git-send-email-gitter.spiros@gmail.com \
--to=gitter.spiros@gmail.com \
--cc=git@vger.kernel.org \
/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).