diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-10-22 01:44:01 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-22 11:03:56 -0700 |
| commit | cf9d52e4899219523359ad1542605395c8c86337 (patch) | |
| tree | ea8989e2f27fd16efc0c7becc6bb4f4a20460985 | |
| parent | 1dacfbcf13693dad508095735a95bc4b12382c57 (diff) | |
| download | git-cf9d52e4899219523359ad1542605395c8c86337.tar.gz git-cf9d52e4899219523359ad1542605395c8c86337.tar.xz | |
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>
| -rw-r--r-- | builtin/checkout-index.c | 3 | ||||
| -rwxr-xr-x | t/t2006-checkout-index-basic.sh | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index a7a5ee10f..3bf342232 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; diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh new file mode 100755 index 000000000..b8559838b --- /dev/null +++ b/t/t2006-checkout-index-basic.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +test_description='basic checkout-index tests +' + +. ./test-lib.sh + +test_expect_success 'checkout-index --gobbledegook' ' + test_expect_code 129 git checkout-index --gobbledegook 2>err && + grep "[Uu]sage" err +' + +test_expect_success 'checkout-index -h in broken repository' ' + mkdir broken && + ( + cd broken && + git init && + >.git/index && + test_expect_code 129 git checkout-index -h >usage 2>&1 + ) && + grep "[Uu]sage" broken/usage +' + +test_done |