Skip to content

Commit 125a05f

Browse files
peffgitster
authored andcommitted
clone: drop connectivity check for local clones
Commit 0433ad1 (clone: run check_everything_connected, 2013-03-25) added the same connectivity check to clone that we use for fetching. The intent was to provide enough safety checks that "git clone git://..." could be counted on to detect bit errors and other repo corruption, and not silently propagate them to the clone. For local clones, this turns out to be a bad idea, for two reasons: 1. Local clones use hard linking (or even shared object stores), and so complete far more quickly. The time spent on the connectivity check is therefore proportionally much more painful. 2. Local clones do not actually meet our safety guarantee anyway. The connectivity check makes sure we have all of the objects we claim to, but it does not check for bit errors. We will notice bit errors in commits and trees, but we do not load blob objects at all. Whereas over the pack transport, we actually recompute the sha1 of each object in the incoming packfile; bit errors change the sha1 of the object, which is then caught by the connectivity check. This patch drops the connectivity check in the local case. Note that we have to revert the changes from 0433ad1 to t5710, as we no longer notice the corruption during clone. We could go a step further and provide a "verify even local clones" option, but it is probably not worthwhile. You can already spell that as "cd foo.git && git fsck && git clone ." or as "git clone --no-local foo.git". Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent edca415 commit 125a05f

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

builtin/clone.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,12 +542,15 @@ static void update_remote_refs(const struct ref *refs,
542542
const struct ref *mapped_refs,
543543
const struct ref *remote_head_points_at,
544544
const char *branch_top,
545-
const char *msg)
545+
const char *msg,
546+
int check_connectivity)
546547
{
547548
const struct ref *rm = mapped_refs;
548549

549-
if (check_everything_connected(iterate_ref_map, 0, &rm))
550-
die(_("remote did not send all necessary objects"));
550+
if (check_connectivity) {
551+
if (check_everything_connected(iterate_ref_map, 0, &rm))
552+
die(_("remote did not send all necessary objects"));
553+
}
551554

552555
if (refs) {
553556
write_remote_refs(mapped_refs);
@@ -950,7 +953,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
950953
transport_fetch_refs(transport, mapped_refs);
951954

952955
update_remote_refs(refs, mapped_refs, remote_head_points_at,
953-
branch_top.buf, reflog_msg.buf);
956+
branch_top.buf, reflog_msg.buf, !is_local);
954957

955958
update_head(our_head_points_at, remote_head, reflog_msg.buf);
956959

t/t5710-info-alternate.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,13 @@ test_expect_success 'creating too deep nesting' \
5858
git clone -l -s D E &&
5959
git clone -l -s E F &&
6060
git clone -l -s F G &&
61-
test_must_fail git clone --bare -l -s G H'
61+
git clone --bare -l -s G H'
62+
63+
test_expect_success 'invalidity of deepest repository' \
64+
'cd H && {
65+
test_valid_repo
66+
test $? -ne 0
67+
}'
6268

6369
cd "$base_dir"
6470

0 commit comments

Comments
 (0)