git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: matthieu.moy@grenoble-inp.fr, Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 05/14] t4012-diff-binary.sh: use the $( ... ) construct for command substitution
Date: Wed, 30 Apr 2014 09:22:58 -0700	[thread overview]
Message-ID: <1398874987-14873-5-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1398874987-14873-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
   sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
done

and then carefully proof-read.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
 t/t4012-diff-binary.sh |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 1215ae5..643d729 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -67,18 +67,18 @@ test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
 	git diff >output &&
 	sed -e "s/-CIT/xCIT/" <output >broken &&
 	test_must_fail git apply --stat --summary broken 2>detected &&
-	detected=`cat detected` &&
-	detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
-	detected=`sed -ne "${detected}p" broken` &&
+	detected=$(cat detected) &&
+	detected=$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") &&
+	detected=$(sed -ne "${detected}p" broken) &&
 	test "$detected" = xCIT
 '
 
 test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
 	git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
 	test_must_fail git apply --stat --summary broken 2>detected &&
-	detected=`cat detected` &&
-	detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
-	detected=`sed -ne "${detected}p" broken` &&
+	detected=$(cat detected) &&
+	detected=$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") &&
+	detected=$(sed -ne "${detected}p" broken) &&
 	test "$detected" = xCIT
 '
 
@@ -88,7 +88,7 @@ test_expect_success 'initial commit' 'git commit -a -m initial'
 test_expect_success 'diff-index with --binary' '
 	echo AIT >a && mv b e && echo CIT >c && cat e >d &&
 	git update-index --add --remove a b c d e &&
-	tree0=`git write-tree` &&
+	tree0=$(git write-tree) &&
 	git diff --cached --binary >current &&
 	git apply --stat --summary current
 '
@@ -96,7 +96,7 @@ test_expect_success 'diff-index with --binary' '
 test_expect_success 'apply binary patch' '
 	git reset --hard &&
 	git apply --binary --index <current &&
-	tree1=`git write-tree` &&
+	tree1=$(git write-tree) &&
 	test "$tree1" = "$tree0"
 '
 
-- 
1.7.10.4

  parent reply	other threads:[~2014-04-30 16:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-30 16:22 [PATCH 01/14] t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution Elia Pinto
2014-04-30 16:22 ` [PATCH 02/14] t3910-mac-os-precompose.sh: " Elia Pinto
2014-04-30 16:22 ` [PATCH 03/14] t4006-diff-mode.sh: " Elia Pinto
2014-04-30 16:22 ` [PATCH 04/14] t4010-diff-pathspec.sh: " Elia Pinto
2014-04-30 16:22 ` Elia Pinto [this message]
2014-04-30 16:22 ` [PATCH 06/14] t4013-diff-various.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 07/14] t4014-format-patch.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 08/14] t4036-format-patch-signer-mime.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 09/14] t4038-diff-combined.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 10/14] t4057-diff-combined-paths.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 11/14] t4116-apply-reverse.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 12/14] t4119-apply-config.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 13/14] t4204-patch-id.sh: " Elia Pinto
2014-04-30 16:23 ` [PATCH 14/14] t5000-tar-tree.sh: " Elia Pinto
2014-04-30 16:42 ` [PATCH 01/14] t3905-stash-include-untracked.sh: " Matthieu Moy
2014-04-30 18:07   ` Junio C Hamano

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=1398874987-14873-5-git-send-email-gitter.spiros@gmail.com \
    --to=gitter.spiros@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=matthieu.moy@grenoble-inp.fr \
    /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).