summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-10-22 06:44:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-22 18:03:56 (GMT)
commitcf9d52e4899219523359ad1542605395c8c86337 (patch)
treeea8989e2f27fd16efc0c7becc6bb4f4a20460985 /builtin
parent1dacfbcf13693dad508095735a95bc4b12382c57 (diff)
downloadgit-cf9d52e4899219523359ad1542605395c8c86337.zip
git-cf9d52e4899219523359ad1542605395c8c86337.tar.gz
git-cf9d52e4899219523359ad1542605395c8c86337.tar.bz2
checkout-index -h: show usage even in an invalid repository
checkout-index loads the index before parsing options. Erroring out is counterproductive at that point if the operator is hunting for a command to recover useful data from the broken repository. [jn: new commit message, 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')
-rw-r--r--builtin/checkout-index.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index a7a5ee1..3bf3422 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -241,6 +241,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
OPT_END()
};
+ if (argc == 2 && !strcmp(argv[1], "-h"))
+ usage_with_options(builtin_checkout_index_usage,
+ builtin_checkout_index_options);
git_config(git_default_config, NULL);
state.base_dir = "";
prefix_length = prefix ? strlen(prefix) : 0;