[PATCH v2] fetch-pack: check for shallow if depth given
- From
Mike Edgar <adgar@google.com>
- Date
- Jun 17, 2015, 11:48 UTC
- Message-ID
- <1434541694-12748-1-git-send-email-adgar@google.com>
- In-Reply-To
- <xmqqzj46dlfw.fsf@gitster.dls.corp.google.com>
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 <adgar@google.com> --- fetch-pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fetch-pack.c b/fetch-pack.c index a912935..a136772 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -809,7 +809,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)
-- 2.2.0.rc0.207.ga3a616c