Skip to content

connected: ignore replacements in the connectivity check #2279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spkrka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

connected: ignore replacements in the connectivity check #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions connected.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
strvec_push(&rev_list.args, "--shallow-file");
strvec_push(&rev_list.args, opt->shallow_file);
}
/* Check the original objects, like fsck and pack-objects do. */
strvec_push(&rev_list.args, "--no-replace-objects");
strvec_push(&rev_list.args,"rev-list");
strvec_push(&rev_list.args, "--objects");
strvec_push(&rev_list.args, "--stdin");
Expand Down
50 changes: 50 additions & 0 deletions t/t6050-replace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,4 +546,54 @@ test_expect_success '--convert-graft-file' '
test_grep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
'

# The connectivity check after a fetch or push must look at the
# objects as they are, like fsck, repack and upload-pack do, not at
# their replacements. Otherwise a replace ref can hide a missing
# object and let an incomplete pack in.
test_expect_success 'setup incomplete bundle hidden by a replacement' '
git init conn-src &&
test_commit -C conn-src base &&
git clone conn-src conn-dst &&
echo content >conn-src/file &&
git -C conn-src add file &&
git -C conn-src commit -m new &&
new=$(git -C conn-src rev-parse HEAD) &&
new_tree=$(git -C conn-src rev-parse HEAD^{tree}) &&
replacement=$(git -C conn-src commit-tree -p HEAD^ \
-m replacement HEAD^^{tree}) &&

# Give the receiving side a complete replacement for the
# new commit, before the commit itself arrives.
echo $replacement |
git -C conn-src pack-objects --stdout >replacement.pack &&
git -C conn-dst index-pack --stdin <replacement.pack &&
git -C conn-dst update-ref refs/replace/$new $replacement &&

# A bundle with the new commit and its tree, but not the blob:
# keep the header of a real bundle and replace its pack.
git -C conn-src branch new &&
git -C conn-src bundle create ../full.bundle base..new &&
{
while read line && test -n "$line"
do
echo "$line" || return 1
done &&
echo &&
printf "%s\n%s\n" $new $new_tree |
git -C conn-src pack-objects --stdout
} <full.bundle >incomplete.bundle
'

test_expect_success 'connectivity check rejects bundle without replacements' '
test_must_fail git -C conn-dst --no-replace-objects \
fetch ../incomplete.bundle new:new 2>err &&
test_grep "did not send all necessary objects" err
'

test_expect_success 'connectivity check ignores replacements' '
test_when_finished "git -C conn-dst update-ref -d refs/heads/new" &&
test_must_fail git -C conn-dst fetch ../incomplete.bundle new:new 2>err &&
test_grep "did not send all necessary objects" err
'

test_done
Loading