mirror of
https://github.com/git/git
synced 2024-10-31 08:22:52 +00:00
4191c35671
Back in e3c6f240fd Junio taught
git-fetch to avoid copying objects when we are fetching from
a repository that is already registered as an alternate object
database. In such a case there is no reason to copy any objects
as we can already obtain them through the alternate.
However we need to ensure the objects are all reachable, so we
run `git rev-list --objects $theirs --not --all` to verify this.
If any object is missing or unreadable then we need to fetch/copy
the objects from the remote. When a missing object is detected
the git-rev-list process will exit with a non-zero exit status,
making this condition quite easy to detect.
Although git-fetch is currently a builtin (and so is rev-list)
we cannot invoke the traverse_objects() API at this point in the
transport code. The object walker within traverse_objects() calls
die() as soon as it finds an object it cannot read. If that happens
we want to resume the fetch process by calling do_fetch_pack().
To get around this we spawn git-rev-list into a background process
to prevent a die() from killing the foreground fetch process,
thus allowing the fetch process to resume into do_fetch_pack()
if copying is necessary.
We aren't interested in the output of rev-list (a list of SHA-1
object names that are reachable) or its errors (a "spurious" error
about an object not being found as we need to copy it) so we redirect
both stdout and stderr to /dev/null.
We run this git-rev-list based check before any fetch as we may
already have the necessary objects local from a prior fetch. If we
don't then its very likely the first $theirs object listed on the
command line won't exist locally and git-rev-list will die very
quickly, allowing us to start the network transfer. This test even
on remote URLs may save bandwidth if someone runs `git pull origin`,
sees a merge conflict, resets out, then redoes the same pull just
a short time later. If the remote hasn't changed between the two
pulls and the local repository hasn't had git-gc run in it then
there is probably no need to perform network transfer as all of
the objects are local.
Documentation for the new quickfetch function was suggested and
written by Junio, based on his original comment in git-fetch.sh.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
122 lines
2.1 KiB
Bash
Executable file
122 lines
2.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test quickfetch from local'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
test_tick &&
|
|
echo ichi >file &&
|
|
git add file &&
|
|
git commit -m initial &&
|
|
|
|
cnt=$( (
|
|
git count-objects | sed -e "s/ *objects,.*//"
|
|
) ) &&
|
|
test $cnt -eq 3
|
|
'
|
|
|
|
test_expect_success 'clone without alternate' '
|
|
|
|
(
|
|
mkdir cloned &&
|
|
cd cloned &&
|
|
git init-db &&
|
|
git remote add -f origin ..
|
|
) &&
|
|
cnt=$( (
|
|
cd cloned &&
|
|
git count-objects | sed -e "s/ *objects,.*//"
|
|
) ) &&
|
|
test $cnt -eq 3
|
|
'
|
|
|
|
test_expect_success 'further commits in the original' '
|
|
|
|
test_tick &&
|
|
echo ni >file &&
|
|
git commit -a -m second &&
|
|
|
|
cnt=$( (
|
|
git count-objects | sed -e "s/ *objects,.*//"
|
|
) ) &&
|
|
test $cnt -eq 6
|
|
'
|
|
|
|
test_expect_success 'copy commit and tree but not blob by hand' '
|
|
|
|
git rev-list --objects HEAD |
|
|
git pack-objects --stdout |
|
|
(
|
|
cd cloned &&
|
|
git unpack-objects
|
|
) &&
|
|
|
|
cnt=$( (
|
|
cd cloned &&
|
|
git count-objects | sed -e "s/ *objects,.*//"
|
|
) ) &&
|
|
test $cnt -eq 6
|
|
|
|
blob=$(git rev-parse HEAD:file | sed -e "s|..|&/|") &&
|
|
test -f "cloned/.git/objects/$blob" &&
|
|
rm -f "cloned/.git/objects/$blob" &&
|
|
|
|
cnt=$( (
|
|
cd cloned &&
|
|
git count-objects | sed -e "s/ *objects,.*//"
|
|
) ) &&
|
|
test $cnt -eq 5
|
|
|
|
'
|
|
|
|
test_expect_success 'quickfetch should not leave a corrupted repository' '
|
|
|
|
(
|
|
cd cloned &&
|
|
git fetch
|
|
) &&
|
|
|
|
cnt=$( (
|
|
cd cloned &&
|
|
git count-objects | sed -e "s/ *objects,.*//"
|
|
) ) &&
|
|
test $cnt -eq 6
|
|
|
|
'
|
|
|
|
test_expect_success 'quickfetch should not copy from alternate' '
|
|
|
|
(
|
|
mkdir quickclone &&
|
|
cd quickclone &&
|
|
git init-db &&
|
|
(cd ../.git/objects && pwd) >.git/objects/info/alternates &&
|
|
git remote add origin .. &&
|
|
git fetch -k -k
|
|
) &&
|
|
obj_cnt=$( (
|
|
cd quickclone &&
|
|
git count-objects | sed -e "s/ *objects,.*//"
|
|
) ) &&
|
|
pck_cnt=$( (
|
|
cd quickclone &&
|
|
git count-objects -v | sed -n -e "/packs:/{
|
|
s/packs://
|
|
p
|
|
q
|
|
}"
|
|
) ) &&
|
|
origin_master=$( (
|
|
cd quickclone &&
|
|
git rev-parse origin/master
|
|
) ) &&
|
|
echo "loose objects: $obj_cnt, packfiles: $pck_cnt" &&
|
|
test $obj_cnt -eq 0 &&
|
|
test $pck_cnt -eq 0 &&
|
|
test z$origin_master = z$(git rev-parse master)
|
|
|
|
'
|
|
|
|
test_done
|