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>
Elia Pinto committed
Apr 28, 2014 at 05:57 UTC
142efa3e43e9c61cb5b97dbe69d36ca090d683d5
1 file changed
+9
-9
t/t1001-read-tree-m-2way.sh
+9
-9
@@ -36,7 +36,7 @@ compare_change () {
36
}
37
38
check_cache_at () {
39
- clean_if_empty=`git diff-files -- "$1"`
39
+ clean_if_empty=$(git diff-files -- "$1")
40
case "$clean_if_empty" in
41
'') echo "$1: clean" ;;
42
?*) echo "$1: dirty" ;;
@@ -68,14 +68,14 @@ test_expect_success \
68
echo rezrov >rezrov &&
69
echo yomin >yomin &&
70
git update-index --add nitfol bozbar rezrov &&
71
- treeH=`git write-tree` &&
71
+ treeH=$(git write-tree) &&
72
echo treeH $treeH &&
73
git ls-tree $treeH &&
74
75
cat bozbar-new >bozbar &&
76
git update-index --add frotz bozbar --force-remove rezrov &&
77
git ls-files --stage >M.out &&
78
- treeM=`git write-tree` &&
78
+ treeM=$(git write-tree) &&
79
echo treeM $treeM &&
80
git ls-tree $treeM &&
81
git diff-tree $treeH $treeM'
@@ -315,7 +315,7 @@ test_expect_success \
315
'rm -f .git/index &&
316
echo DF >DF &&
317
git update-index --add DF &&
318
- treeDF=`git write-tree` &&
318
+ treeDF=$(git write-tree) &&
319
echo treeDF $treeDF &&
320
git ls-tree $treeDF &&
321
@@ -323,7 +323,7 @@ test_expect_success \
323
mkdir DF &&
324
echo DF/DF >DF/DF &&
325
git update-index --add --remove DF DF/DF &&
326
- treeDFDF=`git write-tree` &&
326
+ treeDFDF=$(git write-tree) &&
327
echo treeDFDF $treeDFDF &&
328
git ls-tree $treeDFDF &&
329
git ls-files --stage >DFDF.out'
@@ -345,7 +345,7 @@ test_expect_success \
345
'rm -f .git/index &&
346
: >a &&
347
git update-index --add a &&
348
- treeM=`git write-tree` &&
348
+ treeM=$(git write-tree) &&
349
echo treeM $treeM &&
350
git ls-tree $treeM &&
351
git ls-files --stage >treeM.out &&
@@ -354,7 +354,7 @@ test_expect_success \
354
git update-index --remove a &&
355
mkdir a &&
356
: >a/b &&
357
- treeH=`git write-tree` &&
357
+ treeH=$(git write-tree) &&
358
echo treeH $treeH &&
359
git ls-tree $treeH'
360
@@ -372,7 +372,7 @@ test_expect_success \
372
mkdir c &&
373
: >c/d &&
374
git update-index --add a c/d &&
375
- treeM=`git write-tree` &&
375
+ treeM=$(git write-tree) &&
376
echo treeM $treeM &&
377
git ls-tree $treeM &&
378
git ls-files --stage >treeM.out &&
@@ -381,7 +381,7 @@ test_expect_success \
381
mkdir a &&
382
: >a/b &&
383
git update-index --add --remove a a/b &&
384
- treeH=`git write-tree` &&
384
+ treeH=$(git write-tree) &&
385
echo treeH $treeH &&
386
git ls-tree $treeH'
387