diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-12-05 10:31:11 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-12-06 12:57:10 -0800 |
| commit | 5594bcad21da70d2e9704cf96baa91b8d99dc27b (patch) | |
| tree | 90367668eb9e3dcbe759e1bf92f3f9b385b015b0 /builtin | |
| parent | Git 1.8.4.5 (diff) | |
| download | tgif-5594bcad21da70d2e9704cf96baa91b8d99dc27b.tar.xz | |
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 <knocte@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 4 | ||||
| -rw-r--r-- | builtin/fetch.c | 4 |
2 files changed, 8 insertions, 0 deletions
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); |