undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2013-12-17 12:03:29 -08:00
commit 88cb2f96ac
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/clone.c
View File

@ -796,6 +796,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_local > 0 && !is_local) if (option_local > 0 && !is_local)
warning(_("--local is ignored")); 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) if (argc == 2)
dir = xstrdup(argv[1]); dir = xstrdup(argv[1]);
else else

4
builtin/fetch.c
View File

@ -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 != RECURSE_SUBMODULES_OFF) {
if (recurse_submodules_default) { if (recurse_submodules_default) {
int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default); int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);