[PATCHv4] transport: Catch non positive --depth option value
- From
Andrés G. Aragoneses <knocte@gmail.com>
- Date
- Nov 26, 2013, 11:41 UTC
- Message-ID
- <529488D5.80605@gmail.com>
- In-Reply-To
- <CACsJy8Dfibu96VchD=p_05deLm-46mfXZzcYQg+0BqaN2=To=A@mail.gmail.com>
>From 4f3b24379090b7b69046903fba494f3191577b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= <knocte@gmail.com> Date: Tue, 26 Nov 2013 12:38:19 +0100 Subject: [PATCH] transport: Catch non positive --depth option value
Instead of simply ignoring the value passed to --depth option when it is zero or negative, now it is caught and reported.
This will let people know that they were using the option incorrectly (as depth<0 should be simply invalid, and under the hood depth==0 didn't have any effect).
(The change in fetch.c is needed to avoid the tests failing because of this new restriction.)
Signed-off-by: Andres G. Aragoneses <knocte@gmail.com> Reviewed-by: Duy Nguyen <pclouds@gmail.com> --- builtin/fetch.c | 2 +- transport.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index bd7a101..88c04d7 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -770,7 +770,7 @@ static void backfill_tags(struct transport *transport, struct ref *ref_map) } transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, NULL); - transport_set_option(transport, TRANS_OPT_DEPTH, "0"); + transport_set_option(transport, TRANS_OPT_DEPTH, NULL); fetch_refs(transport, ref_map); if (gsecondary) { diff --git a/transport.c b/transport.c index 7202b77..5b42ccb 100644 --- a/transport.c +++ b/transport.c @@ -483,6 +483,8 @@ static int set_git_option(struct git_transport_options *opts, opts->depth = strtol(value, &end, 0); if (*end) die("transport: invalid depth option '%s'", value); + if (opts->depth < 1) + die("transport: invalid depth option '%s' (must be positive)", value); } return 0; }
-- 1.8.1.2