From: Nguyễn Thái Ngọc Duy Date: Thu, 5 Dec 2013 03:31:11 +0000 (+0700) Subject: clone,fetch: catch non positive --depth option value X-Git-Tag: v1.9-rc0~59^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5594bcad21da70d2e9704cf96baa91b8d99dc27b;p=thirdparty%2Fgit.git clone,fetch: catch non positive --depth option value Instead of simply ignoring the value passed to --depth option when it is zero or negative, catch and report it as an error to let people know that they were using the option incorrectly. Original-patch-by: Andrés G. Aragoneses Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/builtin/clone.c b/builtin/clone.c index 552f3409e3..535b52f315 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -797,6 +797,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (option_local > 0 && !is_local) warning(_("--local is ignored")); + /* no need to be strict, transport_set_option() will validate it again */ + if (option_depth && atoi(option_depth) < 1) + die(_("depth %s is not a positive number"), option_depth); + if (argc == 2) dir = xstrdup(argv[1]); else diff --git a/builtin/fetch.c b/builtin/fetch.c index 564705555b..72930fcfdf 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1045,6 +1045,10 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) } } + /* no need to be strict, transport_set_option() will validate it again */ + if (depth && atoi(depth) < 1) + die(_("depth %s is not a positive number"), depth); + if (recurse_submodules != RECURSE_SUBMODULES_OFF) { if (recurse_submodules_default) { int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);