summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-28 10:00:00 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-28 10:00:00 -0700
commit6653aa9ecd955faccb0ace6f2d8c374b8ea7daaa (patch)
tree643c1402099b6bfec3711b29280ee3cf4dc2a177 /builtin
parente2652c0bcfdeee88f416c6e2c34163545ea30047 (diff)
parent6035d6aad8ca11954c0d7821f6f3e7c047039c8f (diff)
downloadgit-6653aa9ecd955faccb0ace6f2d8c374b8ea7daaa.tar.gz
Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint
Cloning with "git clone --depth N" while fetch.fsckobjects (or transfer.fsckobjects) is set to true did not tell the cut-off points of the shallow history to the process that validates the objects and the history received, causing the validation to fail. * 'nd/clone-connectivity-shortcut' (early part): fetch-pack: prepare updated shallow file before fetching the pack clone: let the user know when check_everything_connected is run
Diffstat (limited to 'builtin')
-rw-r--r--builtin/clone.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index 035ab64950..dad4265989 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -546,8 +546,12 @@ static void update_remote_refs(const struct ref *refs,
{
const struct ref *rm = mapped_refs;
+ if (0 <= option_verbosity)
+ printf(_("Checking connectivity... "));
if (check_everything_connected(iterate_ref_map, 0, &rm))
die(_("remote did not send all necessary objects"));
+ if (0 <= option_verbosity)
+ printf(_("done\n"));
if (refs) {
write_remote_refs(mapped_refs);