Merge branch 'maint'

* maint:
  t5550: repack everything into one file
  Catch invalid --depth option passed to clone or fetch

1 files changed, 6 insertions, 2 deletions

diff --git a/transport.c b/transport.c
index a99b7c9c45..cac0c065ff 100644
--- a/transport.c
+++ b/transport.c
@@ -474,8 +474,12 @@ static int set_git_option(struct git_transport_options *opts,
 	} else if (!strcmp(name, TRANS_OPT_DEPTH)) {
 		if (!value)
 			opts->depth = 0;
-		else
-			opts->depth = atoi(value);
+		else {
+			char *end;
+			opts->depth = strtol(value, &end, 0);
+			if (*end)
+				die("transport: invalid depth option '%s'", value);
+		}
 		return 0;
 	}
 	return 1;