aboutsummaryrefslogtreecommitdiff
path: root/builtin-update-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-18 19:33:38 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-18 19:33:38 -0700
commit2de00bf9e8815970c61cefaef35efeacd8a7d6de (patch)
tree3a9f5d3948d4716c12efaadfeef4c5de10a9dec6 /builtin-update-index.c
parent6fb8e8f401a065bdffe379764871551e37a041a0 (diff)
parent6e6db39afc305e1205a4d2dcf34680bfa80bfc24 (diff)
downloadgit-2de00bf9e8815970c61cefaef35efeacd8a7d6de.tar.gz
git-2de00bf9e8815970c61cefaef35efeacd8a7d6de.tar.xz
Merge branch 'maint'
* maint: fix up strtoul_ui error handling git-tar-tree: complete deprecation conversion message
Diffstat (limited to 'builtin-update-index.c')
-rw-r--r--builtin-update-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c
index b3d4acee6..e5541df28 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -551,7 +551,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
if (i+3 >= argc)
die("git-update-index: --cacheinfo <mode> <sha1> <path>");
- if ((strtoul_ui(argv[i+1], 8, &mode) != 1) ||
+ if (strtoul_ui(argv[i+1], 8, &mode) ||
get_sha1_hex(argv[i+2], sha1) ||
add_cacheinfo(mode, sha1, argv[i+3], 0))
die("git-update-index: --cacheinfo"