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

t7700: make references to SHA-1 generic

Browse Source 
Make the test more hash-agnostic by renaming variables from "sha1" to
some variation of "oid" or "packid". Also, replace the regex,
`[0-9a-f]\{40\}` with `$OID_REGEX`.

A better name for "incrpackid" (incremental pack-id) might have been
just "packid". However, later in the test suite, we have other uses of
"packid". Although the scopes of these variables don't conflict, a
future developer may think that commit_and_pack() and
test_has_duplicate_object() are semantically related somehow since they
share the same variable name. Give them distinct names so that it's
clear these uses are unrelated.

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-12-04 14:03:24 -08:00 committed by Junio C Hamano
parent dcf9a748ca
commit 3699d69df0
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
t/t7700-repack.sh
View File

@ -6,31 +6,31 @@ test_description='git repack works correctly'
commit_and_pack () { commit_and_pack () {
test_commit "$@" 1>&2 && test_commit "$@" 1>&2 &&
SHA1=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) && incrpackid=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
echo pack-${SHA1}.pack echo pack-${incrpackid}.pack
} }
test_no_missing_in_packs () { test_no_missing_in_packs () {
myidx=$(ls -1 .git/objects/pack/*.idx) && myidx=$(ls -1 .git/objects/pack/*.idx) &&
test_path_is_file "$myidx" && test_path_is_file "$myidx" &&
git verify-pack -v alt_objects/pack/*.idx >orig.raw && git verify-pack -v alt_objects/pack/*.idx >orig.raw &&
sed -n -e "s/^\([0-9a-f]\{40\}\).*/\1/p" orig.raw | sort >orig && sed -n -e "s/^\($OID_REGEX\).*/\1/p" orig.raw | sort >orig &&
git verify-pack -v $myidx >dest.raw && git verify-pack -v $myidx >dest.raw &&
cut -d" " -f1 dest.raw | sort >dest && cut -d" " -f1 dest.raw | sort >dest &&
comm -23 orig dest >missing && comm -23 orig dest >missing &&
test_must_be_empty missing test_must_be_empty missing
} }
# we expect $packsha1 and $objsha1 to be defined # we expect $packid and $oid to be defined
test_has_duplicate_object () { test_has_duplicate_object () {
want_duplicate_object="$1" want_duplicate_object="$1"
found_duplicate_object=false found_duplicate_object=false
for p in .git/objects/pack/*.idx for p in .git/objects/pack/*.idx
do do
idx=$(basename $p) idx=$(basename $p)
test "pack-$packsha1.idx" = "$idx" && continue test "pack-$packid.idx" = "$idx" && continue
git verify-pack -v $p >packlist || return $? git verify-pack -v $p >packlist || return $?
if grep "^$objsha1" packlist if grep "^$oid" packlist
then then
found_duplicate_object=true found_duplicate_object=true
echo "DUPLICATE OBJECT FOUND" echo "DUPLICATE OBJECT FOUND"
@ -51,11 +51,11 @@ test_expect_success 'objects in packs marked .keep are not repacked' '
git rev-list --objects --all | grep -v file2 | git rev-list --objects --all | grep -v file2 |
git pack-objects pack && git pack-objects pack &&
# The second pack will contain the excluded object # The second pack will contain the excluded object
packsha1=$(git rev-list --objects --all | grep file2 | packid=$(git rev-list --objects --all | grep file2 |
git pack-objects pack) && git pack-objects pack) &&
>pack-$packsha1.keep && >pack-$packid.keep &&
objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 | oid=$(git verify-pack -v pack-$packid.idx | head -n 1 |
sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") && sed -e "s/^\($OID_REGEX\).*/\1/") &&
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 &&
@ -63,13 +63,13 @@ test_expect_success 'objects in packs marked .keep are not repacked' '
' '
test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' ' test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
# build on $objsha1, $packsha1, and .keep state from previous # build on $oid, $packid, and .keep state from previous
git repack -Adbl && git repack -Adbl &&
test_has_duplicate_object true test_has_duplicate_object true
' '
test_expect_success 'writing bitmaps via config can duplicate .keep objects' ' test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
# build on $objsha1, $packsha1, and .keep state from previous # build on $oid, $packid, and .keep state from previous
git -c repack.writebitmaps=true repack -Adl && git -c repack.writebitmaps=true repack -Adl &&
test_has_duplicate_object true test_has_duplicate_object true
' '
@ -78,7 +78,7 @@ test_expect_success 'loose objects in alternate ODB are not repacked' '
mkdir alt_objects && mkdir alt_objects &&
echo $(pwd)/alt_objects >.git/objects/info/alternates && echo $(pwd)/alt_objects >.git/objects/info/alternates &&
echo content3 >file3 && echo content3 >file3 &&
objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) && oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
git add file3 && git add file3 &&
test_tick && test_tick &&
git commit -m commit_file3 && git commit -m commit_file3 &&
@ -124,7 +124,7 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
test_expect_success 'packed unreachable obs in alternate ODB are not loosened' ' test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
rm -f alt_objects/pack/*.keep && rm -f alt_objects/pack/*.keep &&
mv .git/objects/pack/* alt_objects/pack/ && mv .git/objects/pack/* alt_objects/pack/ &&
csha1=$(git rev-parse HEAD^{commit}) && coid=$(git rev-parse HEAD^{commit}) &&
git reset --hard HEAD^ && git reset --hard HEAD^ &&
test_tick && test_tick &&
git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all && git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
@ -135,14 +135,14 @@ test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
rm -f .git/objects/pack/* && rm -f .git/objects/pack/* &&
mv pack-* .git/objects/pack/ && mv pack-* .git/objects/pack/ &&
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx | test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
grep "^$csha1 " | sort | uniq | wc -l) && grep "^$coid " | sort | uniq | wc -l) &&
echo >.git/objects/info/alternates && echo >.git/objects/info/alternates &&
test_must_fail git show $csha1 test_must_fail git show $coid
' '
test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' ' test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' '
echo $(pwd)/alt_objects >.git/objects/info/alternates && echo $(pwd)/alt_objects >.git/objects/info/alternates &&
echo "$csha1" | git pack-objects --non-empty --all --reflog pack && echo "$coid" | git pack-objects --non-empty --all --reflog pack &&
rm -f .git/objects/pack/* && rm -f .git/objects/pack/* &&
mv pack-* .git/objects/pack/ && mv pack-* .git/objects/pack/ &&
# The pack-objects call on the next line is equivalent to # The pack-objects call on the next line is equivalent to
@ -152,9 +152,9 @@ test_expect_success 'local packed unreachable obs that exist in alternate ODB ar
rm -f .git/objects/pack/* && rm -f .git/objects/pack/* &&
mv pack-* .git/objects/pack/ && mv pack-* .git/objects/pack/ &&
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx | test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
grep "^$csha1 " | sort | uniq | wc -l) && grep "^$coid " | sort | uniq | wc -l) &&
echo >.git/objects/info/alternates && echo >.git/objects/info/alternates &&
test_must_fail git show $csha1 test_must_fail git show $coid
' '
test_expect_success 'objects made unreachable by grafts only are kept' ' test_expect_success 'objects made unreachable by grafts only are kept' '