mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t9137-git-svn-dcommit-clobber-series.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
becd67fd28
commit
2525c5170f
|
@ -16,15 +16,15 @@ test_expect_success 'initialize repo' '
|
|||
'
|
||||
|
||||
test_expect_success '(supposedly) non-conflicting change from SVN' '
|
||||
test x"`sed -n -e 58p < file`" = x58 &&
|
||||
test x"`sed -n -e 61p < file`" = x61 &&
|
||||
test x"$(sed -n -e 58p < file)" = x58 &&
|
||||
test x"$(sed -n -e 61p < file)" = x61 &&
|
||||
svn_cmd co "$svnrepo" tmp &&
|
||||
(cd tmp &&
|
||||
perl -i.bak -p -e "s/^58$/5588/" file &&
|
||||
perl -i.bak -p -e "s/^61$/6611/" file &&
|
||||
poke file &&
|
||||
test x"`sed -n -e 58p < file`" = x5588 &&
|
||||
test x"`sed -n -e 61p < file`" = x6611 &&
|
||||
test x"$(sed -n -e 58p < file)" = x5588 &&
|
||||
test x"$(sed -n -e 61p < file)" = x6611 &&
|
||||
svn_cmd commit -m "58 => 5588, 61 => 6611"
|
||||
)
|
||||
'
|
||||
|
@ -38,20 +38,20 @@ test_expect_success 'some unrelated changes to git' "
|
|||
"
|
||||
|
||||
test_expect_success 'change file but in unrelated area' "
|
||||
test x\"\`sed -n -e 4p < file\`\" = x4 &&
|
||||
test x\"\`sed -n -e 7p < file\`\" = x7 &&
|
||||
test x\"\$(sed -n -e 4p < file)\" = x4 &&
|
||||
test x\"\$(sed -n -e 7p < file)\" = x7 &&
|
||||
perl -i.bak -p -e 's/^4\$/4444/' file &&
|
||||
perl -i.bak -p -e 's/^7\$/7777/' file &&
|
||||
test x\"\`sed -n -e 4p < file\`\" = x4444 &&
|
||||
test x\"\`sed -n -e 7p < file\`\" = x7777 &&
|
||||
test x\"\$(sed -n -e 4p < file)\" = x4444 &&
|
||||
test x\"\$(sed -n -e 7p < file)\" = x7777 &&
|
||||
git commit -m '4 => 4444, 7 => 7777' file &&
|
||||
git svn dcommit &&
|
||||
svn_cmd up tmp &&
|
||||
cd tmp &&
|
||||
test x\"\`sed -n -e 4p < file\`\" = x4444 &&
|
||||
test x\"\`sed -n -e 7p < file\`\" = x7777 &&
|
||||
test x\"\`sed -n -e 58p < file\`\" = x5588 &&
|
||||
test x\"\`sed -n -e 61p < file\`\" = x6611
|
||||
test x\"\$(sed -n -e 4p < file)\" = x4444 &&
|
||||
test x\"\$(sed -n -e 7p < file)\" = x7777 &&
|
||||
test x\"\$(sed -n -e 58p < file)\" = x5588 &&
|
||||
test x\"\$(sed -n -e 61p < file)\" = x6611
|
||||
"
|
||||
|
||||
test_expect_success 'attempt to dcommit with a dirty index' '
|
||||
|
|
Loading…
Reference in a new issue