t9114-git-svn-dcommit-merge.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>
This commit is contained in:
parent
efa639fe6b
commit
78ba28d84b
@ -68,8 +68,8 @@ test_expect_success 'setup git mirror and merge' '
|
||||
test_debug 'gitk --all & sleep 1'
|
||||
|
||||
test_expect_success 'verify pre-merge ancestry' "
|
||||
test x\`git rev-parse --verify refs/heads/svn^2\` = \
|
||||
x\`git rev-parse --verify refs/heads/merge\` &&
|
||||
test x\$(git rev-parse --verify refs/heads/svn^2) = \
|
||||
x\$(git rev-parse --verify refs/heads/merge) &&
|
||||
git cat-file commit refs/heads/svn^ | grep '^friend$'
|
||||
"
|
||||
|
||||
@ -80,10 +80,10 @@ test_expect_success 'git svn dcommit merges' "
|
||||
test_debug 'gitk --all & sleep 1'
|
||||
|
||||
test_expect_success 'verify post-merge ancestry' "
|
||||
test x\`git rev-parse --verify refs/heads/svn\` = \
|
||||
x\`git rev-parse --verify refs/remotes/origin/trunk \` &&
|
||||
test x\`git rev-parse --verify refs/heads/svn^2\` = \
|
||||
x\`git rev-parse --verify refs/heads/merge\` &&
|
||||
test x\$(git rev-parse --verify refs/heads/svn) = \
|
||||
x\$(git rev-parse --verify refs/remotes/origin/trunk) &&
|
||||
test x\$(git rev-parse --verify refs/heads/svn^2) = \
|
||||
x\$(git rev-parse --verify refs/heads/merge) &&
|
||||
git cat-file commit refs/heads/svn^ | grep '^friend$'
|
||||
"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user