Skip to content

Commit

Permalink
Merge branch 'nd/transport-positive-depth-only'
Browse files Browse the repository at this point in the history
"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
  • Loading branch information
Junio C Hamano committed Dec 17, 2013
2 parents ad70448 + 5594bca commit 88cb2f9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions builtin/clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions builtin/fetch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 88cb2f9

Please sign in to comment.