diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-10-22 01:45:47 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-22 11:04:52 -0700 |
| commit | 5d3dd915e64ea42ba6bf7646937784f6ddc71422 (patch) | |
| tree | 62812efcb9a7052ca9151aa038dda376b702b0f4 | |
| parent | cf9d52e4899219523359ad1542605395c8c86337 (diff) | |
| download | git-5d3dd915e64ea42ba6bf7646937784f6ddc71422.tar.gz git-5d3dd915e64ea42ba6bf7646937784f6ddc71422.tar.xz | |
commit/status -h: show usage even with broken configuration
"git status" and "git commit" read .git/config and .gitmodules before
parsing options, but there is no reason to access a repository at all
when the caller just wanted to know what arguments are accepted.
[jn: rewrote the log message and added test]
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/commit.c | 6 | ||||
| -rwxr-xr-x | t/t7508-status.sh | 24 |
2 files changed, 30 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 66fdd2202..0abb43025 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1070,6 +1070,9 @@ int cmd_status(int argc, const char **argv, const char *prefix) OPT_END(), }; + if (argc == 2 && !strcmp(argv[1], "-h")) + usage_with_options(builtin_status_usage, builtin_status_options); + if (null_termination && status_format == STATUS_FORMAT_LONG) status_format = STATUS_FORMAT_PORCELAIN; @@ -1255,6 +1258,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) int allow_fast_forward = 1; struct wt_status s; + if (argc == 2 && !strcmp(argv[1], "-h")) + usage_with_options(builtin_commit_usage, builtin_commit_options); + wt_status_prepare(&s); git_config(git_commit_config, &s); in_merge = file_exists(git_path("MERGE_HEAD")); diff --git a/t/t7508-status.sh b/t/t7508-status.sh index c9300f3c8..beaae9430 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -7,6 +7,30 @@ test_description='git status' . ./test-lib.sh +test_expect_success 'status -h in broken repository' ' + mkdir broken && + test_when_finished "rm -fr broken" && + ( + cd broken && + git init && + echo "[status] showuntrackedfiles = CORRUPT" >>.git/config && + test_expect_code 129 git status -h >usage 2>&1 + ) && + grep "[Uu]sage" broken/usage +' + +test_expect_success 'commit -h in broken repository' ' + mkdir broken && + test_when_finished "rm -fr broken" && + ( + cd broken && + git init && + echo "[status] showuntrackedfiles = CORRUPT" >>.git/config && + test_expect_code 129 git commit -h >usage 2>&1 + ) && + grep "[Uu]sage" broken/usage +' + test_expect_success 'setup' ' : >tracked && : >modified && |