Merge branch 'nd/transport-positive-depth-only'

gitster · gitster · commit 88cb2f96aca8 · 2013-12-17T12:03:29.000-08:00
"git fetch --depth=0" was a no-op, and was silently
ignored. Diagnose it as an error.

* nd/transport-positive-depth-only:
  clone,fetch: catch non positive --depth option value
diff --git a/builtin/clone.c b/builtin/clone.c
@@ -796,6 +796,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
@@ -1079,6 +1079,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
`@@ -1079,6 +1079,10 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`1079`	`1079`	`}`
`1080`	`1080`	`}`
`1081`	`1081`
	`1082`	`+ /* no need to be strict, transport_set_option() will validate it again */`
	`1083`	`+ if (depth && atoi(depth) < 1)`
	`1084`	`+ die(_("depth %s is not a positive number"), depth);`
	`1085`	`+`
`1082`	`1086`	`if (recurse_submodules != RECURSE_SUBMODULES_OFF) {`
`1083`	`1087`	`if (recurse_submodules_default) {`
`1084`	`1088`	`int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);`