mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t/t3511-cherry-pick-x.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
c82ec45e86
commit
9b4950899a
|
@ -77,7 +77,7 @@ test_expect_success setup '
|
|||
|
||||
test_expect_success 'cherry-pick -x inserts blank line after one line subject' '
|
||||
pristine_detach initial &&
|
||||
sha1=`git rev-parse mesg-one-line^0` &&
|
||||
sha1=$(git rev-parse mesg-one-line^0) &&
|
||||
git cherry-pick -x mesg-one-line &&
|
||||
cat <<-EOF >expect &&
|
||||
$mesg_one_line
|
||||
|
@ -114,7 +114,7 @@ test_expect_success 'cherry-pick -s inserts blank line after non-conforming foot
|
|||
|
||||
test_expect_success 'cherry-pick -x inserts blank line when conforming footer not found' '
|
||||
pristine_detach initial &&
|
||||
sha1=`git rev-parse mesg-no-footer^0` &&
|
||||
sha1=$(git rev-parse mesg-no-footer^0) &&
|
||||
git cherry-pick -x mesg-no-footer &&
|
||||
cat <<-EOF >expect &&
|
||||
$mesg_no_footer
|
||||
|
@ -139,7 +139,7 @@ test_expect_success 'cherry-pick -s inserts blank line when conforming footer no
|
|||
|
||||
test_expect_success 'cherry-pick -x -s inserts blank line when conforming footer not found' '
|
||||
pristine_detach initial &&
|
||||
sha1=`git rev-parse mesg-no-footer^0` &&
|
||||
sha1=$(git rev-parse mesg-no-footer^0) &&
|
||||
git cherry-pick -x -s mesg-no-footer &&
|
||||
cat <<-EOF >expect &&
|
||||
$mesg_no_footer
|
||||
|
@ -164,7 +164,7 @@ test_expect_success 'cherry-pick -s adds sob when last sob doesnt match committe
|
|||
|
||||
test_expect_success 'cherry-pick -x -s adds sob when last sob doesnt match committer' '
|
||||
pristine_detach initial &&
|
||||
sha1=`git rev-parse mesg-with-footer^0` &&
|
||||
sha1=$(git rev-parse mesg-with-footer^0) &&
|
||||
git cherry-pick -x -s mesg-with-footer &&
|
||||
cat <<-EOF >expect &&
|
||||
$mesg_with_footer
|
||||
|
@ -187,7 +187,7 @@ test_expect_success 'cherry-pick -s refrains from adding duplicate trailing sob'
|
|||
|
||||
test_expect_success 'cherry-pick -x -s adds sob even when trailing sob exists for committer' '
|
||||
pristine_detach initial &&
|
||||
sha1=`git rev-parse mesg-with-footer-sob^0` &&
|
||||
sha1=$(git rev-parse mesg-with-footer-sob^0) &&
|
||||
git cherry-pick -x -s mesg-with-footer-sob &&
|
||||
cat <<-EOF >expect &&
|
||||
$mesg_with_footer_sob
|
||||
|
@ -200,7 +200,7 @@ test_expect_success 'cherry-pick -x -s adds sob even when trailing sob exists fo
|
|||
|
||||
test_expect_success 'cherry-pick -x treats "(cherry picked from..." line as part of footer' '
|
||||
pristine_detach initial &&
|
||||
sha1=`git rev-parse mesg-with-cherry-footer^0` &&
|
||||
sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
|
||||
git cherry-pick -x mesg-with-cherry-footer &&
|
||||
cat <<-EOF >expect &&
|
||||
$mesg_with_cherry_footer
|
||||
|
@ -223,7 +223,7 @@ test_expect_success 'cherry-pick -s treats "(cherry picked from..." line as part
|
|||
|
||||
test_expect_success 'cherry-pick -x -s treats "(cherry picked from..." line as part of footer' '
|
||||
pristine_detach initial &&
|
||||
sha1=`git rev-parse mesg-with-cherry-footer^0` &&
|
||||
sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
|
||||
git cherry-pick -x -s mesg-with-cherry-footer &&
|
||||
cat <<-EOF >expect &&
|
||||
$mesg_with_cherry_footer
|
||||
|
|
Loading…
Reference in a new issue