t1001-read-tree-m-2way.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
86e3043217
commit
142efa3e43
@ -36,7 +36,7 @@ compare_change () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_cache_at () {
|
check_cache_at () {
|
||||||
clean_if_empty=`git diff-files -- "$1"`
|
clean_if_empty=$(git diff-files -- "$1")
|
||||||
case "$clean_if_empty" in
|
case "$clean_if_empty" in
|
||||||
'') echo "$1: clean" ;;
|
'') echo "$1: clean" ;;
|
||||||
?*) echo "$1: dirty" ;;
|
?*) echo "$1: dirty" ;;
|
||||||
@ -68,14 +68,14 @@ test_expect_success \
|
|||||||
echo rezrov >rezrov &&
|
echo rezrov >rezrov &&
|
||||||
echo yomin >yomin &&
|
echo yomin >yomin &&
|
||||||
git update-index --add nitfol bozbar rezrov &&
|
git update-index --add nitfol bozbar rezrov &&
|
||||||
treeH=`git write-tree` &&
|
treeH=$(git write-tree) &&
|
||||||
echo treeH $treeH &&
|
echo treeH $treeH &&
|
||||||
git ls-tree $treeH &&
|
git ls-tree $treeH &&
|
||||||
|
|
||||||
cat bozbar-new >bozbar &&
|
cat bozbar-new >bozbar &&
|
||||||
git update-index --add frotz bozbar --force-remove rezrov &&
|
git update-index --add frotz bozbar --force-remove rezrov &&
|
||||||
git ls-files --stage >M.out &&
|
git ls-files --stage >M.out &&
|
||||||
treeM=`git write-tree` &&
|
treeM=$(git write-tree) &&
|
||||||
echo treeM $treeM &&
|
echo treeM $treeM &&
|
||||||
git ls-tree $treeM &&
|
git ls-tree $treeM &&
|
||||||
git diff-tree $treeH $treeM'
|
git diff-tree $treeH $treeM'
|
||||||
@ -315,7 +315,7 @@ test_expect_success \
|
|||||||
'rm -f .git/index &&
|
'rm -f .git/index &&
|
||||||
echo DF >DF &&
|
echo DF >DF &&
|
||||||
git update-index --add DF &&
|
git update-index --add DF &&
|
||||||
treeDF=`git write-tree` &&
|
treeDF=$(git write-tree) &&
|
||||||
echo treeDF $treeDF &&
|
echo treeDF $treeDF &&
|
||||||
git ls-tree $treeDF &&
|
git ls-tree $treeDF &&
|
||||||
|
|
||||||
@ -323,7 +323,7 @@ test_expect_success \
|
|||||||
mkdir DF &&
|
mkdir DF &&
|
||||||
echo DF/DF >DF/DF &&
|
echo DF/DF >DF/DF &&
|
||||||
git update-index --add --remove DF DF/DF &&
|
git update-index --add --remove DF DF/DF &&
|
||||||
treeDFDF=`git write-tree` &&
|
treeDFDF=$(git write-tree) &&
|
||||||
echo treeDFDF $treeDFDF &&
|
echo treeDFDF $treeDFDF &&
|
||||||
git ls-tree $treeDFDF &&
|
git ls-tree $treeDFDF &&
|
||||||
git ls-files --stage >DFDF.out'
|
git ls-files --stage >DFDF.out'
|
||||||
@ -345,7 +345,7 @@ test_expect_success \
|
|||||||
'rm -f .git/index &&
|
'rm -f .git/index &&
|
||||||
: >a &&
|
: >a &&
|
||||||
git update-index --add a &&
|
git update-index --add a &&
|
||||||
treeM=`git write-tree` &&
|
treeM=$(git write-tree) &&
|
||||||
echo treeM $treeM &&
|
echo treeM $treeM &&
|
||||||
git ls-tree $treeM &&
|
git ls-tree $treeM &&
|
||||||
git ls-files --stage >treeM.out &&
|
git ls-files --stage >treeM.out &&
|
||||||
@ -354,7 +354,7 @@ test_expect_success \
|
|||||||
git update-index --remove a &&
|
git update-index --remove a &&
|
||||||
mkdir a &&
|
mkdir a &&
|
||||||
: >a/b &&
|
: >a/b &&
|
||||||
treeH=`git write-tree` &&
|
treeH=$(git write-tree) &&
|
||||||
echo treeH $treeH &&
|
echo treeH $treeH &&
|
||||||
git ls-tree $treeH'
|
git ls-tree $treeH'
|
||||||
|
|
||||||
@ -372,7 +372,7 @@ test_expect_success \
|
|||||||
mkdir c &&
|
mkdir c &&
|
||||||
: >c/d &&
|
: >c/d &&
|
||||||
git update-index --add a c/d &&
|
git update-index --add a c/d &&
|
||||||
treeM=`git write-tree` &&
|
treeM=$(git write-tree) &&
|
||||||
echo treeM $treeM &&
|
echo treeM $treeM &&
|
||||||
git ls-tree $treeM &&
|
git ls-tree $treeM &&
|
||||||
git ls-files --stage >treeM.out &&
|
git ls-files --stage >treeM.out &&
|
||||||
@ -381,7 +381,7 @@ test_expect_success \
|
|||||||
mkdir a &&
|
mkdir a &&
|
||||||
: >a/b &&
|
: >a/b &&
|
||||||
git update-index --add --remove a a/b &&
|
git update-index --add --remove a a/b &&
|
||||||
treeH=`git write-tree` &&
|
treeH=$(git write-tree) &&
|
||||||
echo treeH $treeH &&
|
echo treeH $treeH &&
|
||||||
git ls-tree $treeH'
|
git ls-tree $treeH'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user