t/t5302-pack-index.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>
Elia Pinto committed
Dec 22, 2015 at 16:27 UTC
20cffb72355345b6dc8b64ed10e080217ecc7ce0
1 file changed
+17
-17
t/t5302-pack-index.sh
+17
-17
@@ -14,21 +14,21 @@ test_expect_success \
14
i=1 &&
15
while test $i -le 100
16
do
17
- iii=`printf '%03i' $i`
17
+ iii=$(printf '%03i' $i)
18
test-genrandom "bar" 200 > wide_delta_$iii &&
19
test-genrandom "baz $iii" 50 >> wide_delta_$iii &&
20
test-genrandom "foo"$i 100 > deep_delta_$iii &&
21
- test-genrandom "foo"`expr $i + 1` 100 >> deep_delta_$iii &&
22
- test-genrandom "foo"`expr $i + 2` 100 >> deep_delta_$iii &&
21
+ test-genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
22
+ test-genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
23
echo $iii >file_$iii &&
24
test-genrandom "$iii" 8192 >>file_$iii &&
25
git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
26
- i=`expr $i + 1` || return 1
26
+ i=$(expr $i + 1) || return 1
27
done &&
28
{ echo 101 && test-genrandom 100 8192; } >file_101 &&
29
git update-index --add file_101 &&
30
- tree=`git write-tree` &&
31
- commit=`git commit-tree $tree </dev/null` && {
30
+ tree=$(git write-tree) &&
31
+ commit=$(git commit-tree $tree </dev/null) && {
32
echo $tree &&
33
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
34
} >obj-list &&
@@ -152,10 +152,10 @@ test_expect_success \
152
'[index v1] 2) create a stealth corruption in a delta base reference' \
153
'# This test assumes file_101 is a delta smaller than 16 bytes.
154
# It should be against file_100 but we substitute its base for file_099
155
- sha1_101=`git hash-object file_101` &&
156
- sha1_099=`git hash-object file_099` &&
157
- offs_101=`index_obj_offset 1.idx $sha1_101` &&
158
- nr_099=`index_obj_nr 1.idx $sha1_099` &&
155
+ sha1_101=$(git hash-object file_101) &&
156
+ sha1_099=$(git hash-object file_099) &&
157
+ offs_101=$(index_obj_offset 1.idx $sha1_101) &&
158
+ nr_099=$(index_obj_nr 1.idx $sha1_099) &&
159
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
160
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
161
if=".git/objects/pack/pack-${pack1}.idx" \
@@ -193,10 +193,10 @@ test_expect_success \
193
'[index v2] 2) create a stealth corruption in a delta base reference' \
194
'# This test assumes file_101 is a delta smaller than 16 bytes.
195
# It should be against file_100 but we substitute its base for file_099
196
- sha1_101=`git hash-object file_101` &&
197
- sha1_099=`git hash-object file_099` &&
198
- offs_101=`index_obj_offset 1.idx $sha1_101` &&
199
- nr_099=`index_obj_nr 1.idx $sha1_099` &&
196
+ sha1_101=$(git hash-object file_101) &&
197
+ sha1_099=$(git hash-object file_099) &&
198
+ offs_101=$(index_obj_offset 1.idx $sha1_101) &&
199
+ nr_099=$(index_obj_nr 1.idx $sha1_099) &&
200
chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
201
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
202
if=".git/objects/pack/pack-${pack1}.idx" \
@@ -222,11 +222,11 @@ test_expect_success \
222
'rm -f .git/objects/pack/* &&
223
git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
224
git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
225
- obj=`git hash-object file_001` &&
226
- nr=`index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj` &&
225
+ obj=$(git hash-object file_001) &&
226
+ nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
227
chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
228
printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
229
- bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + $nr * 4)) &&
229
+ bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * 20 + $nr * 4)) &&
230
( while read obj
231
do git cat-file -p $obj >/dev/null || exit 1
232
done <obj-list ) &&