mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
t1004-read-tree-m-u-wf.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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7f311eb54b
commit
77317c0c5c
|
@ -30,7 +30,7 @@ test_expect_success 'two-way not clobbering' '
|
|||
|
||||
echo >file2 master creates untracked file2 &&
|
||||
echo >subdir/file2 master creates untracked subdir/file2 &&
|
||||
if err=`read_tree_u_must_succeed -m -u master side 2>&1`
|
||||
if err=$(read_tree_u_must_succeed -m -u master side 2>&1)
|
||||
then
|
||||
echo should have complained
|
||||
false
|
||||
|
@ -43,7 +43,7 @@ echo file2 >.gitignore
|
|||
|
||||
test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
|
||||
|
||||
if err=`read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1`
|
||||
if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1)
|
||||
then
|
||||
echo should have complained
|
||||
false
|
||||
|
@ -54,7 +54,7 @@ test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
|
|||
|
||||
test_expect_success 'two-way with incorrect --exclude-per-directory (2)' '
|
||||
|
||||
if err=`read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1`
|
||||
if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1)
|
||||
then
|
||||
echo should have complained
|
||||
false
|
||||
|
@ -95,7 +95,7 @@ test_expect_success 'three-way not clobbering a working tree file' '
|
|||
git checkout master &&
|
||||
echo >file3 file three created in master, untracked &&
|
||||
echo >subdir/file3 file three created in master, untracked &&
|
||||
if err=`read_tree_u_must_succeed -m -u branch-point master side 2>&1`
|
||||
if err=$(read_tree_u_must_succeed -m -u branch-point master side 2>&1)
|
||||
then
|
||||
echo should have complained
|
||||
false
|
||||
|
|
Loading…
Reference in a new issue