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 13/14] t1020-subdirectory.sh: use the $( ... ) construct for command substitution
Date: Mon, 28 Apr 2014 05:57:36 -0700 [thread overview]
Message-ID: <1398689857-17014-13-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1398689857-17014-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/t1020-subdirectory.sh | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 6902320..62c0d25 100755
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -20,27 +20,27 @@ test_expect_success setup '
test_expect_success 'update-index and ls-files' '
git update-index --add one &&
- case "`git ls-files`" in
+ case "$(git ls-files)" in
one) echo pass one ;;
*) echo bad one; exit 1 ;;
esac &&
(
cd dir &&
git update-index --add two &&
- case "`git ls-files`" in
+ case "$(git ls-files)" in
two) echo pass two ;;
*) echo bad two; exit 1 ;;
esac
) &&
- case "`git ls-files`" in
+ case "$(git ls-files)" in
dir/two"$LF"one) echo pass both ;;
*) echo bad; exit 1 ;;
esac
'
test_expect_success 'cat-file' '
- two=`git ls-files -s dir/two` &&
- two=`expr "$two" : "[0-7]* \\([0-9a-f]*\\)"` &&
+ two=$(git ls-files -s dir/two) &&
+ two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
echo "$two" &&
git cat-file -p "$two" >actual &&
cmp dir/two actual &&
@@ -55,18 +55,18 @@ rm -f actual dir/actual
test_expect_success 'diff-files' '
echo a >>one &&
echo d >>dir/two &&
- case "`git diff-files --name-only`" in
+ case "$(git diff-files --name-only)" in
dir/two"$LF"one) echo pass top ;;
*) echo bad top; exit 1 ;;
esac &&
# diff should not omit leading paths
(
cd dir &&
- case "`git diff-files --name-only`" in
+ case "$(git diff-files --name-only)" in
dir/two"$LF"one) echo pass subdir ;;
*) echo bad subdir; exit 1 ;;
esac &&
- case "`git diff-files --name-only .`" in
+ case "$(git diff-files --name-only .)" in
dir/two) echo pass subdir limited ;;
*) echo bad subdir limited; exit 1 ;;
esac
@@ -74,11 +74,11 @@ test_expect_success 'diff-files' '
'
test_expect_success 'write-tree' '
- top=`git write-tree` &&
+ top=$(git write-tree) &&
echo $top &&
(
cd dir &&
- sub=`git write-tree` &&
+ sub=$(git write-tree) &&
echo $sub &&
test "z$top" = "z$sub"
)
@@ -96,7 +96,7 @@ test_expect_success 'checkout-index' '
test_expect_success 'read-tree' '
rm -f one dir/two &&
- tree=`git write-tree` &&
+ tree=$(git write-tree) &&
read_tree_u_must_succeed --reset -u "$tree" &&
cmp one original.one &&
cmp dir/two original.two &&
--
1.7.10.4
next prev parent reply other threads:[~2014-04-28 12:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-28 12:57 [PATCH 01/14] t0001-init.sh: use the $( ... ) construct for command substitution Elia Pinto
2014-04-28 12:57 ` [PATCH 02/14] t0010-racy-git.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 03/14] t0020-crlf.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 04/14] t0025-crlf-auto.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 05/14] t0026-eol-config.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 06/14] t0030-stripspace.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 07/14] t0300-credentials.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 08/14] t1000-read-tree-m-3way.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 09/14] t1001-read-tree-m-2way.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 10/14] t1002-read-tree-m-u-2way.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 11/14] t1003-read-tree-prefix.sh: " Elia Pinto
2014-04-28 12:57 ` [PATCH 12/14] t1004-read-tree-m-u-wf.sh: " Elia Pinto
2014-04-28 12:57 ` Elia Pinto [this message]
2014-04-28 12:57 ` [PATCH 14/14] t1050-large.sh: " Elia Pinto
2014-04-28 13:56 ` [PATCH 01/14] t0001-init.sh: " 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=1398689857-17014-13-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).