summaryrefslogtreecommitdiff
path: root/builtin/update-index.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-10-22 06:51:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-22 18:04:54 (GMT)
commit9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 (patch)
tree3a283a3e76f44e10b504597487ea213babba17ea /builtin/update-index.c
parentda53eec68873e76c68086e405f3f1329d47055b3 (diff)
downloadgit-9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629.zip
git-9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629.tar.gz
git-9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629.tar.bz2
update-index -h: show usage even with corrupt index
When trying to fix up a corrupt repository, one might prefer that "update-index -h" print an accurate usage message and exit rather than reading the repository and complaining about the corruption. [jn: with rewritten log message and tests] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-index.c')
-rw-r--r--builtin/update-index.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 3ab214d..a41d6d7 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -589,6 +589,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
int lock_error = 0;
struct lock_file *lock_file;
+ if (argc == 2 && !strcmp(argv[1], "-h"))
+ usage(update_index_usage);
+
git_config(git_default_config, NULL);
/* We can't free this memory, it becomes part of a linked list parsed atexit() */