From: Mike Edgar Date: Wed, 17 Jun 2015 11:48:14 +0000 (-0400) Subject: fetch-pack: check for shallow if depth given X-Git-Tag: v2.5.0-rc1~1^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eb86a507a150b8fbb34fb4e59bf9edbefbbad778?ds=inline;hp=--cc fetch-pack: check for shallow if depth given When a repository is first fetched as a shallow clone, either by git-clone or by fetching into an empty repo, the server's capabilities are not currently consulted. The client will send shallow requests even if the server does not understand them, and the resulting error may be unhelpful to the user. This change pre-emptively checks so we can exit with a helpful error if necessary. Signed-off-by: Mike Edgar Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- eb86a507a150b8fbb34fb4e59bf9edbefbbad778 diff --git a/fetch-pack.c b/fetch-pack.c index eeee2bb7e0..e3f4ef2c7a 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -786,7 +786,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, sort_ref_list(&ref, ref_compare_name); qsort(sought, nr_sought, sizeof(*sought), cmp_ref_by_name); - if (is_repository_shallow() && !server_supports("shallow")) + if ((args->depth > 0 || is_repository_shallow()) && !server_supports("shallow")) die("Server does not support shallow clients"); if (server_supports("multi_ack_detailed")) { if (args->verbose)