t/t3700-add.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 perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elia Pinto committed
Dec 22, 2015 at 16:27 UTC
ed6c23142a03269d73e720b05d4968652e1b3cb8
1 file changed
+8
-8
t/t3700-add.sh
+8
-8
@@ -25,7 +25,7 @@ test_expect_success \
25
echo foo >xfoo1 &&
26
chmod 755 xfoo1 &&
27
git add xfoo1 &&
28
- case "`git ls-files --stage xfoo1`" in
28
+ case "$(git ls-files --stage xfoo1)" in
29
100644" "*xfoo1) echo pass;;
30
*) echo fail; git ls-files --stage xfoo1; (exit 1);;
31
esac'
@@ -33,7 +33,7 @@ test_expect_success \
33
test_expect_success 'git add: filemode=0 should not get confused by symlink' '
34
rm -f xfoo1 &&
35
test_ln_s_add foo xfoo1 &&
36
- case "`git ls-files --stage xfoo1`" in
36
+ case "$(git ls-files --stage xfoo1)" in
37
120000" "*xfoo1) echo pass;;
38
*) echo fail; git ls-files --stage xfoo1; (exit 1);;
39
esac
@@ -45,7 +45,7 @@ test_expect_success \
45
echo foo >xfoo2 &&
46
chmod 755 xfoo2 &&
47
git update-index --add xfoo2 &&
48
- case "`git ls-files --stage xfoo2`" in
48
+ case "$(git ls-files --stage xfoo2)" in
49
100644" "*xfoo2) echo pass;;
50
*) echo fail; git ls-files --stage xfoo2; (exit 1);;
51
esac'
@@ -53,7 +53,7 @@ test_expect_success \
53
test_expect_success 'git add: filemode=0 should not get confused by symlink' '
54
rm -f xfoo2 &&
55
test_ln_s_add foo xfoo2 &&
56
- case "`git ls-files --stage xfoo2`" in
56
+ case "$(git ls-files --stage xfoo2)" in
57
120000" "*xfoo2) echo pass;;
58
*) echo fail; git ls-files --stage xfoo2; (exit 1);;
59
esac
@@ -63,7 +63,7 @@ test_expect_success \
63
'git update-index --add: Test that executable bit is not used...' \
64
'git config core.filemode 0 &&
65
test_ln_s_add xfoo2 xfoo3 && # runs git update-index --add
66
- case "`git ls-files --stage xfoo3`" in
66
+ case "$(git ls-files --stage xfoo3)" in
67
120000" "*xfoo3) echo pass;;
68
*) echo fail; git ls-files --stage xfoo3; (exit 1);;
69
esac'
@@ -173,14 +173,14 @@ test_expect_success 'git add with filemode=0, symlinks=0 prefers stage 2 over st
173
174
test_expect_success 'git add --refresh' '
175
>foo && git add foo && git commit -a -m "commit all" &&
176
- test -z "`git diff-index HEAD -- foo`" &&
176
+ test -z "$(git diff-index HEAD -- foo)" &&
177
git read-tree HEAD &&
178
- case "`git diff-index HEAD -- foo`" in
178
+ case "$(git diff-index HEAD -- foo)" in
179
:100644" "*"M foo") echo pass;;
180
*) echo fail; (exit 1);;
181
esac &&
182
git add --refresh -- foo &&
183
- test -z "`git diff-index HEAD -- foo`"
183
+ test -z "$(git diff-index HEAD -- foo)"
184
'
185
186
test_expect_success 'git add --refresh with pathspec' '