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

t7700: move keywords onto their own line

Browse Source 
The code style for tests is to have statements on their own line if
possible. Move keywords onto their own line so that they conform with
the test style.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu 2019-11-27 11:53:49 -08:00 committed by Junio C Hamano
parent 7a1c8c2346
commit d2eee32a89
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
t/t7700-repack.sh
View File

@ -29,10 +29,12 @@ test_expect_success 'objects in packs marked .keep are not repacked' '
mv pack-* .git/objects/pack/ && mv pack-* .git/objects/pack/ &&
git repack -A -d -l && git repack -A -d -l &&
git prune-packed && git prune-packed &&
for p in .git/objects/pack/*.idx; do for p in .git/objects/pack/*.idx
do
idx=$(basename $p) idx=$(basename $p)
test "pack-$packsha1.idx" = "$idx" && continue test "pack-$packsha1.idx" = "$idx" && continue
if git verify-pack -v $p | egrep "^$objsha1"; then if git verify-pack -v $p | egrep "^$objsha1"
then
found_duplicate_object=1 found_duplicate_object=1
echo "DUPLICATE OBJECT FOUND" echo "DUPLICATE OBJECT FOUND"
break break
@ -45,10 +47,12 @@ test_expect_success 'writing bitmaps via command-line can duplicate .keep object
# build on $objsha1, $packsha1, and .keep state from previous # build on $objsha1, $packsha1, and .keep state from previous
git repack -Adbl && git repack -Adbl &&
test_when_finished "found_duplicate_object=" && test_when_finished "found_duplicate_object=" &&
for p in .git/objects/pack/*.idx; do for p in .git/objects/pack/*.idx
do
idx=$(basename $p) idx=$(basename $p)
test "pack-$packsha1.idx" = "$idx" && continue test "pack-$packsha1.idx" = "$idx" && continue
if git verify-pack -v $p | egrep "^$objsha1"; then if git verify-pack -v $p | egrep "^$objsha1"
then
found_duplicate_object=1 found_duplicate_object=1
echo "DUPLICATE OBJECT FOUND" echo "DUPLICATE OBJECT FOUND"
break break
@ -61,10 +65,12 @@ test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
# build on $objsha1, $packsha1, and .keep state from previous # build on $objsha1, $packsha1, and .keep state from previous
git -c repack.writebitmaps=true repack -Adl && git -c repack.writebitmaps=true repack -Adl &&
test_when_finished "found_duplicate_object=" && test_when_finished "found_duplicate_object=" &&
for p in .git/objects/pack/*.idx; do for p in .git/objects/pack/*.idx
do
idx=$(basename $p) idx=$(basename $p)
test "pack-$packsha1.idx" = "$idx" && continue test "pack-$packsha1.idx" = "$idx" && continue
if git verify-pack -v $p | egrep "^$objsha1"; then if git verify-pack -v $p | egrep "^$objsha1"
then
found_duplicate_object=1 found_duplicate_object=1
echo "DUPLICATE OBJECT FOUND" echo "DUPLICATE OBJECT FOUND"
break break
@ -83,8 +89,10 @@ test_expect_success 'loose objects in alternate ODB are not repacked' '
git commit -m commit_file3 && git commit -m commit_file3 &&
git repack -a -d -l && git repack -a -d -l &&
git prune-packed && git prune-packed &&
for p in .git/objects/pack/*.idx; do for p in .git/objects/pack/*.idx
if git verify-pack -v $p | egrep "^$objsha1"; then do
if git verify-pack -v $p | egrep "^$objsha1"
then
found_duplicate_object=1 found_duplicate_object=1
echo "DUPLICATE OBJECT FOUND" echo "DUPLICATE OBJECT FOUND"
break break
@ -99,10 +107,13 @@ test_expect_success 'packed obs in alt ODB are repacked even when local repo is
git repack -a && git repack -a &&
myidx=$(ls -1 .git/objects/pack/*.idx) && myidx=$(ls -1 .git/objects/pack/*.idx) &&
test -f "$myidx" && test -f "$myidx" &&
for p in alt_objects/pack/*.idx; do for p in alt_objects/pack/*.idx
do
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
done | while read sha1 rest; do done | while read sha1 rest
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then do
if ! ( git verify-pack -v $myidx | grep "^$sha1" )
then
echo "Missing object in local pack: $sha1" echo "Missing object in local pack: $sha1"
return 1 return 1
fi fi
@ -119,10 +130,13 @@ test_expect_success 'packed obs in alt ODB are repacked when local repo has pack
git repack -a -d && git repack -a -d &&
myidx=$(ls -1 .git/objects/pack/*.idx) && myidx=$(ls -1 .git/objects/pack/*.idx) &&
test -f "$myidx" && test -f "$myidx" &&
for p in alt_objects/pack/*.idx; do for p in alt_objects/pack/*.idx
do
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
done | while read sha1 rest; do done | while read sha1 rest
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then do
if ! ( git verify-pack -v $myidx | grep "^$sha1" )
then
echo "Missing object in local pack: $sha1" echo "Missing object in local pack: $sha1"
return 1 return 1
fi fi
@ -144,10 +158,13 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
git repack -a -d && git repack -a -d &&
myidx=$(ls -1 .git/objects/pack/*.idx) && myidx=$(ls -1 .git/objects/pack/*.idx) &&
test -f "$myidx" && test -f "$myidx" &&
for p in alt_objects/pack/*.idx; do for p in alt_objects/pack/*.idx
do
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
done | while read sha1 rest; do done | while read sha1 rest
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then do
if ! ( git verify-pack -v $myidx | grep "^$sha1" )
then
echo "Missing object in local pack: $sha1" echo "Missing object in local pack: $sha1"
return 1 return 1
fi fi