Skip to content

Commit 2353ad9

Browse files
committed
Merge branch 'jt/connected-show-missing-from-which-side' into seen
We may find an object missing after a "git fetch" stores the objects it obtained from the other side; attempt to tell if the missing object was missing before "git fetch" started or it is missing because the other side did not send it. source: <[email protected]> * jt/connected-show-missing-from-which-side: fetch,fetch-pack: clarify connectivity check error
2 parents b268078 + e9004de commit 2353ad9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

builtin/fetch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
11381138

11391139
rm = ref_map;
11401140
if (check_connected(iterate_ref_map, &rm, &opt)) {
1141-
rc = error(_("%s did not send all necessary objects\n"), url);
1141+
rc = error(_("connectivity check failed after fetching from %s\n"), url);
11421142
goto abort;
11431143
}
11441144
}

fetch-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2047,7 +2047,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
20472047
if (args->deepen)
20482048
opt.is_deepening_fetch = 1;
20492049
if (check_connected(iterate_ref_map, &iterator, &opt)) {
2050-
error(_("remote did not send all necessary objects"));
2050+
error(_("connectivity check failed after fetching from remote"));
20512051
free_refs(ref_cpy);
20522052
ref_cpy = NULL;
20532053
rollback_shallow_file(the_repository, &shallow_lock);

0 commit comments

Comments
 (0)