diff options
| author | Elia Pinto <gitter.spiros@gmail.com> | 2016-01-12 10:45:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-12 19:47:29 (GMT) |
| commit | 78ba28d84b5be8cbb1d5d5e7d65b5522739ad5ce (patch) | |
| tree | c6fa72b7d07c6a9697d66b56c9f47194e218a8fa /t/t9114-git-svn-dcommit-merge.sh | |
| parent | efa639fe6b850de699b675bf3e9c4b35f54f54bc (diff) | |
| download | git-78ba28d84b5be8cbb1d5d5e7d65b5522739ad5ce.zip git-78ba28d84b5be8cbb1d5d5e7d65b5522739ad5ce.tar.gz git-78ba28d84b5be8cbb1d5d5e7d65b5522739ad5ce.tar.bz2 | |
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>
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
| -rwxr-xr-x | t/t9114-git-svn-dcommit-merge.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index fb41876..a3d3882 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -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$' " |