summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorElia Pinto <gitter.spiros@gmail.com>2014-04-28 12:57:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-29 19:44:30 (GMT)
commit86e30432177470f50be4207da2cc0422f86a24f7 (patch)
tree2a468248597699da5a12f2c883b0185550df7a65 /t/t1000-read-tree-m-3way.sh
parentdd64267fe2151b1ea3f19b5745d0fa8321995381 (diff)
downloadgit-86e30432177470f50be4207da2cc0422f86a24f7.zip
git-86e30432177470f50be4207da2cc0422f86a24f7.tar.gz
git-86e30432177470f50be4207da2cc0422f86a24f7.tar.bz2
t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
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> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
-rwxr-xr-xt/t1000-read-tree-m-3way.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index babcdd2..a0b79b4 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -519,10 +519,10 @@ test_expect_success \
'rm -f .git/index F16 &&
echo F16 >F16 &&
git update-index --add F16 &&
- tree0=`git write-tree` &&
+ tree0=$(git write-tree) &&
echo E16 >F16 &&
git update-index F16 &&
- tree1=`git write-tree` &&
+ tree1=$(git write-tree) &&
read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 &&
git ls-files --stage'