diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-01 23:02:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-01 23:02:33 +0200 |
| commit | 58eb0122f3f4799a1b7a3ce836e52dcb2dad45bd (patch) | |
| tree | 9ceae7879b7970a35d5d9e5f9015ef916d1bdc70 /fetch-pack.c | |
| parent | Merge branch 'jc/prompt-document-ps1-state-separator' (diff) | |
| parent | fetch-pack: check for shallow if depth given (diff) | |
| download | git-58eb0122f3f4799a1b7a3ce836e52dcb2dad45bd.tar.xz git-58eb0122f3f4799a1b7a3ce836e52dcb2dad45bd.zip | |
Merge branch 'me/fetch-into-shallow-safety'
"git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
a shallow transfer request even to an upload-pack that does not
support the capability.
* me/fetch-into-shallow-safety:
fetch-pack: check for shallow if depth given
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index a912935a63..a136772152 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) |