t9104-git-svn-follow-parent.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
Jan 12, 2016 at 10:45 UTC
cd914d8090d64c8df1b0c45327de7dacdf370a09
1 file changed
+34
-34
t/t9104-git-svn-follow-parent.sh
+34
-34
@@ -31,12 +31,12 @@ test_expect_success 'initialize repo' '
31
test_expect_success 'init and fetch a moved directory' '
32
git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
33
git svn fetch -i thunk &&
34
- test "`git rev-parse --verify refs/remotes/thunk@2`" \
35
- = "`git rev-parse --verify refs/remotes/thunk~1`" &&
36
- test "`git cat-file blob refs/remotes/thunk:readme |\
37
- sed -n -e "3p"`" = goodbye &&
38
- test -z "`git config --get svn-remote.svn.fetch \
39
- "^trunk:refs/remotes/thunk@2$"`"
34
+ test "$(git rev-parse --verify refs/remotes/thunk@2)" \
35
+ = "$(git rev-parse --verify refs/remotes/thunk~1)" &&
36
+ test "$(git cat-file blob refs/remotes/thunk:readme |\
37
+ sed -n -e "3p")" = goodbye &&
38
+ test -z "$(git config --get svn-remote.svn.fetch \
39
+ "^trunk:refs/remotes/thunk@2$")"
40
'
41
42
test_expect_success 'init and fetch from one svn-remote' '
@@ -46,10 +46,10 @@ test_expect_success 'init and fetch from one svn-remote' '
46
git config --add svn-remote.svn.fetch \
47
thunk:refs/remotes/svn/thunk &&
48
git svn fetch -i svn/thunk &&
49
- test "`git rev-parse --verify refs/remotes/svn/trunk`" \
50
- = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
51
- test "`git cat-file blob refs/remotes/svn/thunk:readme |\
52
- sed -n -e "3p"`" = goodbye
49
+ test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
50
+ = "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
51
+ test "$(git cat-file blob refs/remotes/svn/thunk:readme |\
52
+ sed -n -e "3p")" = goodbye
53
'
54
55
test_expect_success 'follow deleted parent' '
@@ -61,9 +61,9 @@ test_expect_success 'follow deleted parent' '
61
junk:refs/remotes/svn/junk &&
62
git svn fetch -i svn/thunk &&
63
git svn fetch -i svn/junk &&
64
- test -z "`git diff svn/junk svn/trunk`" &&
65
- test "`git merge-base svn/junk svn/trunk`" \
66
- = "`git rev-parse svn/trunk`"
64
+ test -z "$(git diff svn/junk svn/trunk)" &&
65
+ test "$(git merge-base svn/junk svn/trunk)" \
66
+ = "$(git rev-parse svn/trunk)"
67
'
68
69
test_expect_success 'follow larger parent' '
@@ -80,10 +80,10 @@ test_expect_success 'follow larger parent' '
80
git rev-parse --verify refs/remotes/larger &&
81
git rev-parse --verify \
82
refs/remotes/larger-parent &&
83
- test "`git merge-base \
83
+ test "$(git merge-base \
84
refs/remotes/larger-parent \
85
- refs/remotes/larger`" = \
86
- "`git rev-parse refs/remotes/larger`"
85
+ refs/remotes/larger)" = \
86
+ "$(git rev-parse refs/remotes/larger)"
87
'
88
89
test_expect_success 'follow higher-level parent' '
@@ -106,8 +106,8 @@ test_expect_success 'follow deleted directory' '
106
svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
107
git svn init --minimize-url -i glob "$svnrepo"/glob &&
108
git svn fetch -i glob &&
109
- test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
110
- test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1
109
+ test "$(git cat-file blob refs/remotes/glob:blob/bye)" = hi &&
110
+ test "$(git ls-tree refs/remotes/glob | wc -l )" -eq 1
111
'
112
113
# ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn)
@@ -142,9 +142,9 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
142
git svn init --minimize-url -i r9270-t \
143
"$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
144
git svn fetch -i r9270-t &&
145
- test `git rev-list r9270-t | wc -l` -eq 2 &&
146
- test "`git ls-tree --name-only r9270-t~1`" = \
147
- "`git ls-tree --name-only r9270-t`"
145
+ test $(git rev-list r9270-t | wc -l) -eq 2 &&
146
+ test "$(git ls-tree --name-only r9270-t~1)" = \
147
+ "$(git ls-tree --name-only r9270-t)"
148
'
149
150
test_expect_success "track initial change if it was only made to parent" '
@@ -152,11 +152,11 @@ test_expect_success "track initial change if it was only made to parent" '
152
git svn init --minimize-url -i r9270-d \
153
"$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
154
git svn fetch -i r9270-d &&
155
- test `git rev-list r9270-d | wc -l` -eq 3 &&
156
- test "`git ls-tree --name-only r9270-t`" = \
157
- "`git ls-tree --name-only r9270-d`" &&
158
- test "`git rev-parse r9270-t`" = \
159
- "`git rev-parse r9270-d~1`"
155
+ test $(git rev-list r9270-d | wc -l) -eq 3 &&
156
+ test "$(git ls-tree --name-only r9270-t)" = \
157
+ "$(git ls-tree --name-only r9270-d)" &&
158
+ test "$(git rev-parse r9270-t)" = \
159
+ "$(git rev-parse r9270-d~1)"
160
'
161
162
test_expect_success "follow-parent is atomic" '
@@ -193,19 +193,19 @@ test_expect_success "follow-parent is atomic" '
193
git svn fetch -i stunk &&
194
git svn init --minimize-url -i flunked "$svnrepo"/flunked &&
195
git svn fetch -i flunked &&
196
- test "`git rev-parse --verify refs/remotes/flunk@18`" \
197
- = "`git rev-parse --verify refs/remotes/stunk`" &&
198
- test "`git rev-parse --verify refs/remotes/flunk~1`" \
199
- = "`git rev-parse --verify refs/remotes/stunk`" &&
200
- test "`git rev-parse --verify refs/remotes/flunked~1`" \
201
- = "`git rev-parse --verify refs/remotes/stunk~1`"
196
+ test "$(git rev-parse --verify refs/remotes/flunk@18)" \
197
+ = "$(git rev-parse --verify refs/remotes/stunk)" &&
198
+ test "$(git rev-parse --verify refs/remotes/flunk~1)" \
199
+ = "$(git rev-parse --verify refs/remotes/stunk)" &&
200
+ test "$(git rev-parse --verify refs/remotes/flunked~1)" \
201
+ = "$(git rev-parse --verify refs/remotes/stunk~1)"
202
'
203
204
test_expect_success "track multi-parent paths" '
205
svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
206
git svn multi-fetch &&
207
- test `git cat-file commit refs/remotes/glob | \
208
- grep "^parent " | wc -l` -eq 2
207
+ test $(git cat-file commit refs/remotes/glob | \
208
+ grep "^parent " | wc -l) -eq 2
209
'
210
211
test_expect_success "multi-fetch continues to work" "