t1004-read-tree-m-u-wf.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>
Elia Pinto committed
Apr 28, 2014 at 05:57 UTC
77317c0c5c24e799a397b7d32080a9490fc23b11
1 file changed
+4
-4
t/t1004-read-tree-m-u-wf.sh
+4
-4
@@ -30,7 +30,7 @@ test_expect_success 'two-way not clobbering' '
30
31
echo >file2 master creates untracked file2 &&
32
echo >subdir/file2 master creates untracked subdir/file2 &&
33
- if err=`read_tree_u_must_succeed -m -u master side 2>&1`
33
+ if err=$(read_tree_u_must_succeed -m -u master side 2>&1)
34
then
35
echo should have complained
36
false
@@ -43,7 +43,7 @@ echo file2 >.gitignore
43
44
test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
45
46
- if err=`read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1`
46
+ if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1)
47
then
48
echo should have complained
49
false
@@ -54,7 +54,7 @@ test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
54
55
test_expect_success 'two-way with incorrect --exclude-per-directory (2)' '
56
57
- if err=`read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1`
57
+ if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1)
58
then
59
echo should have complained
60
false
@@ -95,7 +95,7 @@ test_expect_success 'three-way not clobbering a working tree file' '
95
git checkout master &&
96
echo >file3 file three created in master, untracked &&
97
echo >subdir/file3 file three created in master, untracked &&
98
- if err=`read_tree_u_must_succeed -m -u branch-point master side 2>&1`
98
+ if err=$(read_tree_u_must_succeed -m -u branch-point master side 2>&1)
99
then
100
echo should have complained
101
false