2008-11-12 20:59:02 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='git repack works correctly'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2018-04-15 18:36:13 +03:00
|
|
|
commit_and_pack() {
|
|
|
|
|
test_commit "$@" >/dev/null &&
|
|
|
|
|
SHA1=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
|
|
|
|
|
echo pack-${SHA1}.pack
|
|
|
|
|
}
|
|
|
|
|
|
2008-11-12 20:59:05 +03:00
|
|
|
test_expect_success 'objects in packs marked .keep are not repacked' '
|
2008-11-12 20:59:02 +03:00
|
|
|
echo content1 > file1 &&
|
|
|
|
|
echo content2 > file2 &&
|
|
|
|
|
git add . &&
|
2010-04-15 02:09:57 +04:00
|
|
|
test_tick &&
|
2008-11-12 20:59:02 +03:00
|
|
|
git commit -m initial_commit &&
|
|
|
|
|
# Create two packs
|
|
|
|
|
# The first pack will contain all of the objects except one
|
|
|
|
|
git rev-list --objects --all | grep -v file2 |
|
|
|
|
|
git pack-objects pack > /dev/null &&
|
|
|
|
|
# The second pack will contain the excluded object
|
|
|
|
|
packsha1=$(git rev-list --objects --all | grep file2 |
|
|
|
|
|
git pack-objects pack) &&
|
2014-01-23 23:55:18 +04:00
|
|
|
>pack-$packsha1.keep &&
|
2008-11-12 20:59:02 +03:00
|
|
|
objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 |
|
|
|
|
|
sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") &&
|
|
|
|
|
mv pack-* .git/objects/pack/ &&
|
2014-06-11 10:32:45 +04:00
|
|
|
git repack -A -d -l &&
|
2008-11-12 20:59:02 +03:00
|
|
|
git prune-packed &&
|
|
|
|
|
for p in .git/objects/pack/*.idx; do
|
|
|
|
|
idx=$(basename $p)
|
|
|
|
|
test "pack-$packsha1.idx" = "$idx" && continue
|
|
|
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
|
|
|
found_duplicate_object=1
|
|
|
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done &&
|
|
|
|
|
test -z "$found_duplicate_object"
|
|
|
|
|
'
|
|
|
|
|
|
2014-06-11 00:09:23 +04:00
|
|
|
test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
|
repack: add `repack.packKeptObjects` config var
The git-repack command always passes `--honor-pack-keep`
to pack-objects. This has traditionally been a good thing,
as we do not want to duplicate those objects in a new pack,
and we are not going to delete the old pack.
However, when bitmaps are in use, it is important for a full
repack to include all reachable objects, even if they may be
duplicated in a .keep pack. Otherwise, we cannot generate
the bitmaps, as the on-disk format requires the set of
objects in the pack to be fully closed.
Even if the repository does not generally have .keep files,
a simultaneous push could cause a race condition in which a
.keep file exists at the moment of a repack. The repack may
try to include those objects in one of two situations:
1. The pushed .keep pack contains objects that were
already in the repository (e.g., blobs due to a revert of
an old commit).
2. Receive-pack updates the refs, making the objects
reachable, but before it removes the .keep file, the
repack runs.
In either case, we may prefer to duplicate some objects in
the new, full pack, and let the next repack (after the .keep
file is cleaned up) take care of removing them.
This patch introduces both a command-line and config option
to disable the `--honor-pack-keep` option. By default, it
is triggered when pack.writeBitmaps (or `--write-bitmap-index`
is turned on), but specifying it explicitly can override the
behavior (e.g., in cases where you prefer .keep files to
bitmaps, but only when they are present).
Note that this option just disables the pack-objects
behavior. We still leave packs with a .keep in place, as we
do not necessarily know that we have duplicated all of their
objects.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-04 00:04:20 +04:00
|
|
|
# build on $objsha1, $packsha1, and .keep state from previous
|
2014-06-11 00:08:38 +04:00
|
|
|
git repack -Adbl &&
|
repack: add `repack.packKeptObjects` config var
The git-repack command always passes `--honor-pack-keep`
to pack-objects. This has traditionally been a good thing,
as we do not want to duplicate those objects in a new pack,
and we are not going to delete the old pack.
However, when bitmaps are in use, it is important for a full
repack to include all reachable objects, even if they may be
duplicated in a .keep pack. Otherwise, we cannot generate
the bitmaps, as the on-disk format requires the set of
objects in the pack to be fully closed.
Even if the repository does not generally have .keep files,
a simultaneous push could cause a race condition in which a
.keep file exists at the moment of a repack. The repack may
try to include those objects in one of two situations:
1. The pushed .keep pack contains objects that were
already in the repository (e.g., blobs due to a revert of
an old commit).
2. Receive-pack updates the refs, making the objects
reachable, but before it removes the .keep file, the
repack runs.
In either case, we may prefer to duplicate some objects in
the new, full pack, and let the next repack (after the .keep
file is cleaned up) take care of removing them.
This patch introduces both a command-line and config option
to disable the `--honor-pack-keep` option. By default, it
is triggered when pack.writeBitmaps (or `--write-bitmap-index`
is turned on), but specifying it explicitly can override the
behavior (e.g., in cases where you prefer .keep files to
bitmaps, but only when they are present).
Note that this option just disables the pack-objects
behavior. We still leave packs with a .keep in place, as we
do not necessarily know that we have duplicated all of their
objects.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-04 00:04:20 +04:00
|
|
|
test_when_finished "found_duplicate_object=" &&
|
|
|
|
|
for p in .git/objects/pack/*.idx; do
|
|
|
|
|
idx=$(basename $p)
|
|
|
|
|
test "pack-$packsha1.idx" = "$idx" && continue
|
|
|
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
|
|
|
found_duplicate_object=1
|
|
|
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done &&
|
|
|
|
|
test "$found_duplicate_object" = 1
|
|
|
|
|
'
|
|
|
|
|
|
2014-06-11 00:09:23 +04:00
|
|
|
test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
|
|
|
|
|
# build on $objsha1, $packsha1, and .keep state from previous
|
2014-06-11 00:20:30 +04:00
|
|
|
git -c repack.writebitmaps=true repack -Adl &&
|
repack: add `repack.packKeptObjects` config var
The git-repack command always passes `--honor-pack-keep`
to pack-objects. This has traditionally been a good thing,
as we do not want to duplicate those objects in a new pack,
and we are not going to delete the old pack.
However, when bitmaps are in use, it is important for a full
repack to include all reachable objects, even if they may be
duplicated in a .keep pack. Otherwise, we cannot generate
the bitmaps, as the on-disk format requires the set of
objects in the pack to be fully closed.
Even if the repository does not generally have .keep files,
a simultaneous push could cause a race condition in which a
.keep file exists at the moment of a repack. The repack may
try to include those objects in one of two situations:
1. The pushed .keep pack contains objects that were
already in the repository (e.g., blobs due to a revert of
an old commit).
2. Receive-pack updates the refs, making the objects
reachable, but before it removes the .keep file, the
repack runs.
In either case, we may prefer to duplicate some objects in
the new, full pack, and let the next repack (after the .keep
file is cleaned up) take care of removing them.
This patch introduces both a command-line and config option
to disable the `--honor-pack-keep` option. By default, it
is triggered when pack.writeBitmaps (or `--write-bitmap-index`
is turned on), but specifying it explicitly can override the
behavior (e.g., in cases where you prefer .keep files to
bitmaps, but only when they are present).
Note that this option just disables the pack-objects
behavior. We still leave packs with a .keep in place, as we
do not necessarily know that we have duplicated all of their
objects.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-03-04 00:04:20 +04:00
|
|
|
test_when_finished "found_duplicate_object=" &&
|
|
|
|
|
for p in .git/objects/pack/*.idx; do
|
|
|
|
|
idx=$(basename $p)
|
|
|
|
|
test "pack-$packsha1.idx" = "$idx" && continue
|
|
|
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
|
|
|
found_duplicate_object=1
|
|
|
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done &&
|
|
|
|
|
test "$found_duplicate_object" = 1
|
|
|
|
|
'
|
|
|
|
|
|
2008-11-10 08:59:58 +03:00
|
|
|
test_expect_success 'loose objects in alternate ODB are not repacked' '
|
2008-11-10 08:59:56 +03:00
|
|
|
mkdir alt_objects &&
|
2016-01-08 14:06:25 +03:00
|
|
|
echo $(pwd)/alt_objects > .git/objects/info/alternates &&
|
2008-11-10 08:59:56 +03:00
|
|
|
echo content3 > file3 &&
|
|
|
|
|
objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
|
|
|
|
|
git add file3 &&
|
2010-04-15 02:09:57 +04:00
|
|
|
test_tick &&
|
2008-11-10 08:59:56 +03:00
|
|
|
git commit -m commit_file3 &&
|
|
|
|
|
git repack -a -d -l &&
|
|
|
|
|
git prune-packed &&
|
|
|
|
|
for p in .git/objects/pack/*.idx; do
|
|
|
|
|
if git verify-pack -v $p | egrep "^$objsha1"; then
|
|
|
|
|
found_duplicate_object=1
|
|
|
|
|
echo "DUPLICATE OBJECT FOUND"
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done &&
|
|
|
|
|
test -z "$found_duplicate_object"
|
|
|
|
|
'
|
|
|
|
|
|
2008-11-13 03:50:26 +03:00
|
|
|
test_expect_success 'packed obs in alt ODB are repacked even when local repo is packless' '
|
2010-10-31 10:30:58 +03:00
|
|
|
mkdir alt_objects/pack &&
|
2008-11-13 03:50:26 +03:00
|
|
|
mv .git/objects/pack/* alt_objects/pack &&
|
|
|
|
|
git repack -a &&
|
|
|
|
|
myidx=$(ls -1 .git/objects/pack/*.idx) &&
|
|
|
|
|
test -f "$myidx" &&
|
|
|
|
|
for p in alt_objects/pack/*.idx; do
|
|
|
|
|
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
|
|
|
|
|
done | while read sha1 rest; do
|
|
|
|
|
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
|
|
|
|
|
echo "Missing object in local pack: $sha1"
|
|
|
|
|
return 1
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
'
|
|
|
|
|
|
2009-04-25 03:18:53 +04:00
|
|
|
test_expect_success 'packed obs in alt ODB are repacked when local repo has packs' '
|
t7700: demonstrate misbehavior of 'repack -a' when local packs exist
The ability to "...fatten [the] local repository by packing everything that
is needed by the local ref into a single new pack, including things that are
borrowed from alternates"[1] is supposed to be provided by the '-a' or '-A'
options to repack when '-l' is not used, but there is a flaw. For each
pack in the local repository without a .keep file, repack supplies a
--unpacked=<pack> argument to pack-objects.
The --unpacked option to pack-objects, with or without an argument, causes
pack-objects to ignore any object which is packed in a pack not mentioned
in an argument to --unpacked=. So, if there are local packs, and
'repack -a' is called, then any objects which reside in packs accessible
through alternates will _not_ be packed. If there are no local packs, then
no --unpacked argument will be supplied, and repack will behave as expected.
[1] http://mid.gmane.org/7v8wrwidi3.fsf@gitster.siamese.dyndns.org
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-10 01:14:39 +03:00
|
|
|
rm -f .git/objects/pack/* &&
|
|
|
|
|
echo new_content >> file1 &&
|
|
|
|
|
git add file1 &&
|
2010-04-15 02:09:57 +04:00
|
|
|
test_tick &&
|
t7700: demonstrate misbehavior of 'repack -a' when local packs exist
The ability to "...fatten [the] local repository by packing everything that
is needed by the local ref into a single new pack, including things that are
borrowed from alternates"[1] is supposed to be provided by the '-a' or '-A'
options to repack when '-l' is not used, but there is a flaw. For each
pack in the local repository without a .keep file, repack supplies a
--unpacked=<pack> argument to pack-objects.
The --unpacked option to pack-objects, with or without an argument, causes
pack-objects to ignore any object which is packed in a pack not mentioned
in an argument to --unpacked=. So, if there are local packs, and
'repack -a' is called, then any objects which reside in packs accessible
through alternates will _not_ be packed. If there are no local packs, then
no --unpacked argument will be supplied, and repack will behave as expected.
[1] http://mid.gmane.org/7v8wrwidi3.fsf@gitster.siamese.dyndns.org
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-01-10 01:14:39 +03:00
|
|
|
git commit -m more_content &&
|
|
|
|
|
git repack &&
|
|
|
|
|
git repack -a -d &&
|
|
|
|
|
myidx=$(ls -1 .git/objects/pack/*.idx) &&
|
|
|
|
|
test -f "$myidx" &&
|
|
|
|
|
for p in alt_objects/pack/*.idx; do
|
|
|
|
|
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
|
|
|
|
|
done | while read sha1 rest; do
|
|
|
|
|
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
|
|
|
|
|
echo "Missing object in local pack: $sha1"
|
|
|
|
|
return 1
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
'
|
|
|
|
|
|
2009-03-20 06:47:51 +03:00
|
|
|
test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
|
2009-03-20 06:47:50 +03:00
|
|
|
# swap the .keep so the commit object is in the pack with .keep
|
|
|
|
|
for p in alt_objects/pack/*.pack
|
|
|
|
|
do
|
2010-10-31 10:30:58 +03:00
|
|
|
base_name=$(basename $p .pack) &&
|
2009-03-20 06:47:50 +03:00
|
|
|
if test -f alt_objects/pack/$base_name.keep
|
|
|
|
|
then
|
|
|
|
|
rm alt_objects/pack/$base_name.keep
|
|
|
|
|
else
|
|
|
|
|
touch alt_objects/pack/$base_name.keep
|
|
|
|
|
fi
|
2010-10-31 10:30:58 +03:00
|
|
|
done &&
|
2009-03-20 06:47:50 +03:00
|
|
|
git repack -a -d &&
|
|
|
|
|
myidx=$(ls -1 .git/objects/pack/*.idx) &&
|
|
|
|
|
test -f "$myidx" &&
|
|
|
|
|
for p in alt_objects/pack/*.idx; do
|
|
|
|
|
git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
|
|
|
|
|
done | while read sha1 rest; do
|
|
|
|
|
if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
|
|
|
|
|
echo "Missing object in local pack: $sha1"
|
|
|
|
|
return 1
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
'
|
|
|
|
|
|
2009-03-20 06:47:52 +03:00
|
|
|
test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
|
2009-03-20 06:47:50 +03:00
|
|
|
rm -f alt_objects/pack/*.keep &&
|
|
|
|
|
mv .git/objects/pack/* alt_objects/pack/ &&
|
|
|
|
|
csha1=$(git rev-parse HEAD^{commit}) &&
|
|
|
|
|
git reset --hard HEAD^ &&
|
2010-04-15 02:09:57 +04:00
|
|
|
test_tick &&
|
|
|
|
|
git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
|
2009-03-20 06:47:50 +03:00
|
|
|
# The pack-objects call on the next line is equivalent to
|
|
|
|
|
# git repack -A -d without the call to prune-packed
|
|
|
|
|
git pack-objects --honor-pack-keep --non-empty --all --reflog \
|
|
|
|
|
--unpack-unreachable </dev/null pack &&
|
|
|
|
|
rm -f .git/objects/pack/* &&
|
|
|
|
|
mv pack-* .git/objects/pack/ &&
|
|
|
|
|
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
|
|
|
|
egrep "^$csha1 " | sort | uniq | wc -l) &&
|
|
|
|
|
echo > .git/objects/info/alternates &&
|
|
|
|
|
test_must_fail git show $csha1
|
|
|
|
|
'
|
|
|
|
|
|
2009-03-22 01:26:11 +03:00
|
|
|
test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' '
|
2016-01-08 14:06:25 +03:00
|
|
|
echo $(pwd)/alt_objects > .git/objects/info/alternates &&
|
2009-03-22 01:25:30 +03:00
|
|
|
echo "$csha1" | git pack-objects --non-empty --all --reflog pack &&
|
|
|
|
|
rm -f .git/objects/pack/* &&
|
|
|
|
|
mv pack-* .git/objects/pack/ &&
|
|
|
|
|
# The pack-objects call on the next line is equivalent to
|
|
|
|
|
# git repack -A -d without the call to prune-packed
|
|
|
|
|
git pack-objects --honor-pack-keep --non-empty --all --reflog \
|
|
|
|
|
--unpack-unreachable </dev/null pack &&
|
|
|
|
|
rm -f .git/objects/pack/* &&
|
|
|
|
|
mv pack-* .git/objects/pack/ &&
|
|
|
|
|
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
|
|
|
|
egrep "^$csha1 " | sort | uniq | wc -l) &&
|
|
|
|
|
echo > .git/objects/info/alternates &&
|
|
|
|
|
test_must_fail git show $csha1
|
|
|
|
|
'
|
|
|
|
|
|
2009-07-23 19:33:49 +04:00
|
|
|
test_expect_success 'objects made unreachable by grafts only are kept' '
|
2009-07-23 19:33:45 +04:00
|
|
|
test_tick &&
|
|
|
|
|
git commit --allow-empty -m "commit 4" &&
|
|
|
|
|
H0=$(git rev-parse HEAD) &&
|
|
|
|
|
H1=$(git rev-parse HEAD^) &&
|
|
|
|
|
H2=$(git rev-parse HEAD^^) &&
|
|
|
|
|
echo "$H0 $H2" > .git/info/grafts &&
|
2010-04-15 02:09:57 +04:00
|
|
|
git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
|
2009-07-23 19:33:45 +04:00
|
|
|
git repack -a -d &&
|
|
|
|
|
git cat-file -t $H1
|
2018-04-15 18:36:12 +03:00
|
|
|
'
|
2009-07-23 19:33:45 +04:00
|
|
|
|
2018-04-15 18:36:13 +03:00
|
|
|
test_expect_success 'repack --keep-pack' '
|
|
|
|
|
test_create_repo keep-pack &&
|
|
|
|
|
(
|
|
|
|
|
cd keep-pack &&
|
|
|
|
|
P1=$(commit_and_pack 1) &&
|
|
|
|
|
P2=$(commit_and_pack 2) &&
|
|
|
|
|
P3=$(commit_and_pack 3) &&
|
|
|
|
|
P4=$(commit_and_pack 4) &&
|
|
|
|
|
ls .git/objects/pack/*.pack >old-counts &&
|
|
|
|
|
test_line_count = 4 old-counts &&
|
|
|
|
|
git repack -a -d --keep-pack $P1 --keep-pack $P4 &&
|
|
|
|
|
ls .git/objects/pack/*.pack >new-counts &&
|
|
|
|
|
grep -q $P1 new-counts &&
|
|
|
|
|
grep -q $P4 new-counts &&
|
|
|
|
|
test_line_count = 3 new-counts &&
|
|
|
|
|
git fsck
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2008-11-12 20:59:02 +03:00
|
|
|
test_done
|
|
|
|
|
|
