2008-05-10 04:01:55 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2008-09-03 08:59:33 +00:00
|
|
|
test_description='git repack works correctly'
|
2008-05-10 04:01:55 +00:00
|
|
|
|
2020-11-18 23:44:40 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2008-05-10 04:01:55 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2008-06-29 00:25:05 +00:00
|
|
|
fsha1=
|
|
|
|
csha1=
|
|
|
|
tsha1=
|
|
|
|
|
2008-11-13 20:11:46 +00:00
|
|
|
test_expect_success '-A with -d option leaves unreachable objects unpacked' '
|
2008-05-10 04:01:55 +00:00
|
|
|
echo content > file1 &&
|
|
|
|
git add . &&
|
2010-04-14 22:09:57 +00:00
|
|
|
test_tick &&
|
2008-05-10 04:01:55 +00:00
|
|
|
git commit -m initial_commit &&
|
|
|
|
# create a transient branch with unique content
|
|
|
|
git checkout -b transient_branch &&
|
|
|
|
echo more content >> file1 &&
|
|
|
|
# record the objects created in the database for file, commit, tree
|
|
|
|
fsha1=$(git hash-object file1) &&
|
2010-04-14 22:09:57 +00:00
|
|
|
test_tick &&
|
2008-05-10 04:01:55 +00:00
|
|
|
git commit -a -m more_content &&
|
|
|
|
csha1=$(git rev-parse HEAD^{commit}) &&
|
|
|
|
tsha1=$(git rev-parse HEAD^{tree}) &&
|
2020-11-18 23:44:40 +00:00
|
|
|
git checkout main &&
|
2008-05-10 04:01:55 +00:00
|
|
|
echo even more content >> file1 &&
|
2010-04-14 22:09:57 +00:00
|
|
|
test_tick &&
|
2008-05-10 04:01:55 +00:00
|
|
|
git commit -a -m even_more_content &&
|
|
|
|
# delete the transient branch
|
|
|
|
git branch -D transient_branch &&
|
|
|
|
# pack the repo
|
|
|
|
git repack -A -d -l &&
|
|
|
|
# verify objects are packed in repository
|
|
|
|
test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
2008-09-30 08:03:55 +00:00
|
|
|
egrep "^($fsha1|$csha1|$tsha1) " |
|
2008-05-10 04:01:55 +00:00
|
|
|
sort | uniq | wc -l) &&
|
|
|
|
git show $fsha1 &&
|
|
|
|
git show $csha1 &&
|
|
|
|
git show $tsha1 &&
|
2010-04-14 22:09:57 +00:00
|
|
|
# now expire the reflog, while keeping reachable ones but expiring
|
|
|
|
# unreachables immediately
|
|
|
|
test_tick &&
|
|
|
|
sometimeago=$(( $test_tick - 10000 )) &&
|
|
|
|
git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
|
2008-05-10 04:01:55 +00:00
|
|
|
# and repack
|
|
|
|
git repack -A -d -l &&
|
|
|
|
# verify objects are retained unpacked
|
|
|
|
test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
|
2008-09-30 08:03:55 +00:00
|
|
|
egrep "^($fsha1|$csha1|$tsha1) " |
|
2008-05-10 04:01:55 +00:00
|
|
|
sort | uniq | wc -l) &&
|
|
|
|
git show $fsha1 &&
|
|
|
|
git show $csha1 &&
|
|
|
|
git show $tsha1
|
|
|
|
'
|
|
|
|
|
2008-06-29 00:25:05 +00:00
|
|
|
compare_mtimes ()
|
|
|
|
{
|
2018-04-06 22:19:47 +00:00
|
|
|
read tref &&
|
|
|
|
while read t; do
|
2015-03-25 05:29:10 +00:00
|
|
|
test "$tref" = "$t" || return 1
|
2009-01-28 09:52:26 +00:00
|
|
|
done
|
2008-06-29 00:25:05 +00:00
|
|
|
}
|
|
|
|
|
2008-11-13 20:11:46 +00:00
|
|
|
test_expect_success '-A without -d option leaves unreachable objects packed' '
|
2008-06-29 00:25:05 +00:00
|
|
|
fsha1path=$(echo "$fsha1" | sed -e "s|\(..\)|\1/|") &&
|
|
|
|
fsha1path=".git/objects/$fsha1path" &&
|
|
|
|
csha1path=$(echo "$csha1" | sed -e "s|\(..\)|\1/|") &&
|
|
|
|
csha1path=".git/objects/$csha1path" &&
|
|
|
|
tsha1path=$(echo "$tsha1" | sed -e "s|\(..\)|\1/|") &&
|
|
|
|
tsha1path=".git/objects/$tsha1path" &&
|
|
|
|
git branch transient_branch $csha1 &&
|
|
|
|
git repack -a -d -l &&
|
|
|
|
test ! -f "$fsha1path" &&
|
|
|
|
test ! -f "$csha1path" &&
|
|
|
|
test ! -f "$tsha1path" &&
|
|
|
|
test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) &&
|
|
|
|
packfile=$(ls .git/objects/pack/pack-*.pack) &&
|
|
|
|
git branch -D transient_branch &&
|
2010-04-14 22:09:57 +00:00
|
|
|
test_tick &&
|
2008-06-29 00:25:05 +00:00
|
|
|
git repack -A -l &&
|
2008-11-13 20:11:46 +00:00
|
|
|
test ! -f "$fsha1path" &&
|
|
|
|
test ! -f "$csha1path" &&
|
|
|
|
test ! -f "$tsha1path" &&
|
|
|
|
git show $fsha1 &&
|
|
|
|
git show $csha1 &&
|
|
|
|
git show $tsha1
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'unpacked objects receive timestamp of pack file' '
|
|
|
|
tmppack=".git/objects/pack/tmp_pack" &&
|
|
|
|
ln "$packfile" "$tmppack" &&
|
|
|
|
git repack -A -l -d &&
|
2018-04-25 04:29:00 +00:00
|
|
|
test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
|
2009-01-28 09:52:26 +00:00
|
|
|
> mtimes &&
|
|
|
|
compare_mtimes < mtimes
|
2008-06-29 00:25:05 +00:00
|
|
|
'
|
|
|
|
|
2012-04-07 10:30:09 +00:00
|
|
|
test_expect_success 'do not bother loosening old objects' '
|
|
|
|
obj1=$(echo one | git hash-object -w --stdin) &&
|
|
|
|
obj2=$(echo two | git hash-object -w --stdin) &&
|
|
|
|
pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
|
|
|
|
pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
|
|
|
|
git prune-packed &&
|
|
|
|
git cat-file -p $obj1 &&
|
|
|
|
git cat-file -p $obj2 &&
|
2018-03-24 07:44:31 +00:00
|
|
|
test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
|
2012-04-07 10:30:09 +00:00
|
|
|
git repack -A -d --unpack-unreachable=1.hour.ago &&
|
|
|
|
git cat-file -p $obj1 &&
|
|
|
|
test_must_fail git cat-file -p $obj2
|
|
|
|
'
|
|
|
|
|
2014-10-17 00:44:49 +00:00
|
|
|
test_expect_success 'keep packed objects found only in index' '
|
|
|
|
echo my-unique-content >file &&
|
|
|
|
git add file &&
|
|
|
|
git commit -m "make it reachable" &&
|
|
|
|
git gc &&
|
|
|
|
git reset HEAD^ &&
|
|
|
|
git reflog expire --expire=now --all &&
|
|
|
|
git add file &&
|
2018-03-24 07:44:31 +00:00
|
|
|
test-tool chmtime =-86400 .git/objects/pack/* &&
|
2014-10-17 00:44:49 +00:00
|
|
|
git gc --prune=1.hour.ago &&
|
|
|
|
git cat-file blob :file
|
|
|
|
'
|
|
|
|
|
repack: add --keep-unreachable option
The usual way to do a full repack (and what is done by
git-gc) is to run "repack -Ad --unpack-unreachable=<when>",
which will loosen any unreachable objects newer than
"<when>", and drop any older ones.
This is a safer alternative to "repack -ad", because
"<when>" becomes a grace period during which we will not
drop any new objects that are about to be referenced.
However, it isn't perfectly safe. It's always possible that
a process is about to reference an old object. Even if that
process were to take care to update the timestamp on the
object, there is no atomicity with a simultaneously running
"repack" process.
So while unlikely, there is a small race wherein we may drop
an object that is in the process of being referenced. If you
do automated repacking on a large number of active
repositories, you may hit it eventually, and the result is a
corrupted repository.
It would be nice to fix that race in the long run, but it's
complicated. In the meantime, there is a much simpler
strategy for automated repository maintenance: do not drop
objects at all. We already have a "--keep-unreachable"
option in pack-objects; we just need to plumb it through
from git-repack.
Note that this _isn't_ plumbed through from git-gc, so at
this point it's strictly a tool for people doing their own
advanced repository maintenance strategy.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-13 04:36:28 +00:00
|
|
|
test_expect_success 'repack -k keeps unreachable packed objects' '
|
|
|
|
# create packed-but-unreachable object
|
|
|
|
sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
|
|
|
|
pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
|
|
|
|
git prune-packed &&
|
|
|
|
|
|
|
|
# -k should keep it
|
|
|
|
git repack -adk &&
|
|
|
|
git cat-file -p $sha1 &&
|
|
|
|
|
|
|
|
# and double check that without -k it would have been removed
|
|
|
|
git repack -ad &&
|
|
|
|
test_must_fail git cat-file -p $sha1
|
|
|
|
'
|
|
|
|
|
repack: extend --keep-unreachable to loose objects
If you use "repack -adk" currently, we will pack all objects
that are already packed into the new pack, and then drop the
old packs. However, loose unreachable objects will be left
as-is. In theory these are meant to expire eventually with
"git prune". But if you are using "repack -k", you probably
want to keep things forever and therefore do not run "git
prune" at all. Meaning those loose objects may build up over
time and end up fooling any object-count heuristics (such as
the one done by "gc --auto", though since git-gc does not
support "repack -k", this really applies to whatever custom
scripts people might have driving "repack -k").
With this patch, we instead stuff any loose unreachable
objects into the pack along with the already-packed
unreachable objects. This may seem wasteful, but it is
really no more so than using "repack -k" in the first place.
We are at a slight disadvantage, in that we have no useful
ordering for the result, or names to hand to the delta code.
However, this is again no worse than what "repack -k" is
already doing for the packed objects. The packing of these
objects doesn't matter much because they should not be
accessed frequently (unless they actually _do_ become
referenced, but then they would get moved to a different
part of the packfile during the next repack).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-13 04:38:04 +00:00
|
|
|
test_expect_success 'repack -k packs unreachable loose objects' '
|
|
|
|
# create loose unreachable object
|
|
|
|
sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
|
|
|
|
objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
|
|
|
|
test_path_is_file $objpath &&
|
|
|
|
|
|
|
|
# and confirm that the loose object goes away, but we can
|
|
|
|
# still access it (ergo, it is packed)
|
|
|
|
git repack -adk &&
|
|
|
|
test_path_is_missing $objpath &&
|
|
|
|
git cat-file -p $sha1
|
|
|
|
'
|
|
|
|
|
2008-05-10 04:01:55 +00:00
|
|
|
test_done
|