clone,fetch: catch non positive --depth option value

pclouds · gitster · commit 5594bcad21da · 2013-12-06T12:57:10.000-08:00
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 &lt;knocte@gmail.com&gt;
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1045,6 +1045,10 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`1045`	`1045`	`}`
`1046`	`1046`	`}`
`1047`	`1047`
	`1048`	`+ /* no need to be strict, transport_set_option() will validate it again */`
	`1049`	`+ if (depth && atoi(depth) < 1)`
	`1050`	`+ die(_("depth %s is not a positive number"), depth);`
	`1051`	`+`
`1048`	`1052`	`if (recurse_submodules != RECURSE_SUBMODULES_OFF) {`
`1049`	`1053`	`if (recurse_submodules_default) {`
`1050`	`1054`	`int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);`