[PATCH 2/7] checkout-index -h: show usage even in an invalid repository
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Oct 22, 2010, 06:44 UTC
- Message-ID
- <20101022064400.GC6081@burratino>
- In-Reply-To
- <20101022063837.GA6081@burratino>
From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
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> --- builtin/checkout-index.c | 3 +++ t/t2006-checkout-index-basic.sh | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) create mode 100755 t/t2006-checkout-index-basic.sh
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; diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh new file mode 100755 index 0000000..b855983 --- /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
-- 1.7.2.3