undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/t5302-pack-index.sh: use the $( ... ) construct for command substitution

Browse Source 
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:
Elia Pinto 2015-12-22 16:27:53 +01:00 committed by Junio C Hamano
parent 046dec74af
commit 20cffb7235
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
t/t5302-pack-index.sh
View File

@ -14,21 +14,21 @@ test_expect_success \
i=1 && i=1 &&
while test $i -le 100 while test $i -le 100
do do
iii=`printf '%03i' $i` iii=$(printf '%03i' $i)
test-genrandom "bar" 200 > wide_delta_$iii && test-genrandom "bar" 200 > wide_delta_$iii &&
test-genrandom "baz $iii" 50 >> wide_delta_$iii && test-genrandom "baz $iii" 50 >> wide_delta_$iii &&
test-genrandom "foo"$i 100 > deep_delta_$iii && test-genrandom "foo"$i 100 > deep_delta_$iii &&
test-genrandom "foo"`expr $i + 1` 100 >> deep_delta_$iii && test-genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
test-genrandom "foo"`expr $i + 2` 100 >> deep_delta_$iii && test-genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
echo $iii >file_$iii && echo $iii >file_$iii &&
test-genrandom "$iii" 8192 >>file_$iii && test-genrandom "$iii" 8192 >>file_$iii &&
git update-index --add file_$iii deep_delta_$iii wide_delta_$iii && git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
i=`expr $i + 1` || return 1 i=$(expr $i + 1) || return 1
done && done &&
{ echo 101 && test-genrandom 100 8192; } >file_101 && { echo 101 && test-genrandom 100 8192; } >file_101 &&
git update-index --add file_101 && git update-index --add file_101 &&
tree=`git write-tree` && tree=$(git write-tree) &&
commit=`git commit-tree $tree </dev/null` && { commit=$(git commit-tree $tree </dev/null) && {
echo $tree && echo $tree &&
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/" git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
} >obj-list && } >obj-list &&
@ -152,10 +152,10 @@ test_expect_success \
'[index v1] 2) create a stealth corruption in a delta base reference' \ '[index v1] 2) create a stealth corruption in a delta base reference' \
'# This test assumes file_101 is a delta smaller than 16 bytes. '# This test assumes file_101 is a delta smaller than 16 bytes.
# It should be against file_100 but we substitute its base for file_099 # It should be against file_100 but we substitute its base for file_099
sha1_101=`git hash-object file_101` && sha1_101=$(git hash-object file_101) &&
sha1_099=`git hash-object file_099` && sha1_099=$(git hash-object file_099) &&
offs_101=`index_obj_offset 1.idx $sha1_101` && offs_101=$(index_obj_offset 1.idx $sha1_101) &&
nr_099=`index_obj_nr 1.idx $sha1_099` && nr_099=$(index_obj_nr 1.idx $sha1_099) &&
chmod +w ".git/objects/pack/pack-${pack1}.pack" && chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \ dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
if=".git/objects/pack/pack-${pack1}.idx" \ if=".git/objects/pack/pack-${pack1}.idx" \
@ -193,10 +193,10 @@ test_expect_success \
'[index v2] 2) create a stealth corruption in a delta base reference' \ '[index v2] 2) create a stealth corruption in a delta base reference' \
'# This test assumes file_101 is a delta smaller than 16 bytes. '# This test assumes file_101 is a delta smaller than 16 bytes.
# It should be against file_100 but we substitute its base for file_099 # It should be against file_100 but we substitute its base for file_099
sha1_101=`git hash-object file_101` && sha1_101=$(git hash-object file_101) &&
sha1_099=`git hash-object file_099` && sha1_099=$(git hash-object file_099) &&
offs_101=`index_obj_offset 1.idx $sha1_101` && offs_101=$(index_obj_offset 1.idx $sha1_101) &&
nr_099=`index_obj_nr 1.idx $sha1_099` && nr_099=$(index_obj_nr 1.idx $sha1_099) &&
chmod +w ".git/objects/pack/pack-${pack1}.pack" && chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \ dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
if=".git/objects/pack/pack-${pack1}.idx" \ if=".git/objects/pack/pack-${pack1}.idx" \
@ -222,11 +222,11 @@ test_expect_success \
'rm -f .git/objects/pack/* && 'rm -f .git/objects/pack/* &&
git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" && git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
git verify-pack ".git/objects/pack/pack-${pack1}.pack" && git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
obj=`git hash-object file_001` && obj=$(git hash-object file_001) &&
nr=`index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj` && nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
chmod +w ".git/objects/pack/pack-${pack1}.idx" && chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \ printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
bs=1 count=4 seek=$((8 + 256 * 4 + `wc -l <obj-list` * 20 + $nr * 4)) && bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * 20 + $nr * 4)) &&
( while read obj ( while read obj
do git cat-file -p $obj >/dev/null || exit 1 do git cat-file -p $obj >/dev/null || exit 1
done <obj-list ) && done <obj-list ) &&