[PATCH 02/14] cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:04:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
Use convert_ui() instead of strtoul_ui() to parse the <mode> argument. This tightens up the parsing a bit: * Leading whitespace is no longer allowed * '+' and '-' are no longer allowed Signed-off-by: Michael Haggerty <redacted> --- builtin/update-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 5878986..845e944 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c@@ -4,6 +4,7 @@ * Copyright (C) Linus Torvalds, 2005 */ #include "cache.h" +#include "numparse.h" #include "lockfile.h" #include "quote.h" #include "cache-tree.h"
@@ -672,7 +673,7 @@ static int cacheinfo_callback(struct parse_opt_ctx_t *ctx, } if (ctx->argc <= 3) return error("option 'cacheinfo' expects <mode>,<sha1>,<path>"); - if (strtoul_ui(*++ctx->argv, 8, &mode) || + if (convert_ui(*++ctx->argv, 8, &mode) || get_sha1_hex(*++ctx->argv, sha1) || add_cacheinfo(mode, sha1, *++ctx->argv, 0)) die("git update-index: --cacheinfo cannot add %s", *ctx->argv);
--
2.1.4