From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 09/10] t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution
Date: Tue, 12 Jan 2016 10:45:17 +0000 [thread overview]
Message-ID: <1452595518-38149-10-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1452595518-38149-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/t9114-git-svn-dcommit-merge.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index fb41876..a3d3882 100755
--- a/t/t9114-git-svn-dcommit-merge.sh
+++ b/t/t9114-git-svn-dcommit-merge.sh
@@ -68,8 +68,8 @@ test_expect_success 'setup git mirror and merge' '
test_debug 'gitk --all & sleep 1'
test_expect_success 'verify pre-merge ancestry' "
- test x\`git rev-parse --verify refs/heads/svn^2\` = \
- x\`git rev-parse --verify refs/heads/merge\` &&
+ test x\$(git rev-parse --verify refs/heads/svn^2) = \
+ x\$(git rev-parse --verify refs/heads/merge) &&
git cat-file commit refs/heads/svn^ | grep '^friend$'
"
@@ -80,10 +80,10 @@ test_expect_success 'git svn dcommit merges' "
test_debug 'gitk --all & sleep 1'
test_expect_success 'verify post-merge ancestry' "
- test x\`git rev-parse --verify refs/heads/svn\` = \
- x\`git rev-parse --verify refs/remotes/origin/trunk \` &&
- test x\`git rev-parse --verify refs/heads/svn^2\` = \
- x\`git rev-parse --verify refs/heads/merge\` &&
+ test x\$(git rev-parse --verify refs/heads/svn) = \
+ x\$(git rev-parse --verify refs/remotes/origin/trunk) &&
+ test x\$(git rev-parse --verify refs/heads/svn^2) = \
+ x\$(git rev-parse --verify refs/heads/merge) &&
git cat-file commit refs/heads/svn^ | grep '^friend$'
"
--
2.5.0
next prev parent reply other threads:[~2016-01-12 10:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 10:45 [PATCH 00/10] use the $( ... ) construct for command substitution Elia Pinto
2016-01-12 10:45 ` [PATCH 01/10] t9100-git-svn-basic.sh: " Elia Pinto
2016-01-12 19:56 ` Junio C Hamano
2016-01-12 10:45 ` [PATCH 02/10] t9101-git-svn-props.sh: " Elia Pinto
2016-01-12 10:45 ` [PATCH 03/10] t9104-git-svn-follow-parent.sh: " Elia Pinto
2016-01-12 10:45 ` [PATCH 04/10] t9105-git-svn-commit-diff.sh: " Elia Pinto
2016-01-12 10:45 ` [PATCH 05/10] t9107-git-svn-migrate.sh: " Elia Pinto
2016-01-12 10:45 ` [PATCH 06/10] t9108-git-svn-glob.sh: " Elia Pinto
2016-01-12 10:45 ` [PATCH 07/10] t9109-git-svn-multi-glob.sh: " Elia Pinto
2016-01-12 10:45 ` [PATCH 08/10] t9110-git-svn-use-svm-props.sh: " Elia Pinto
2016-01-12 10:45 ` Elia Pinto [this message]
2016-01-12 10:45 ` [PATCH 10/10] t9118-git-svn-funky-branch-names.sh: " Elia Pinto
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=1452595518-38149-10-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).