diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-13 08:49:50 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-13 08:49:50 +0300 |
commit | 6758af89e4bf3f767e189da3e09c3c939162872d (patch) | |
tree | d0f25a4cd8c831949748fe9334aaad595e225cd1 /t/t7508-status.sh | |
parent | 4443091d961e91041e64c1675940f0585eeba456 (diff) | |
parent | 9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 (diff) |
Merge branch 'jn/git-cmd-h-bypass-setup'
* jn/git-cmd-h-bypass-setup:
update-index -h: show usage even with corrupt index
merge -h: show usage even with corrupt index
ls-files -h: show usage even with corrupt index
gc -h: show usage even with broken configuration
commit/status -h: show usage even with broken configuration
checkout-index -h: show usage even in an invalid repository
branch -h: show usage even in an invalid repository
Conflicts:
builtin/merge.c
Diffstat (limited to 't/t7508-status.sh')
-rwxr-xr-x | t/t7508-status.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 4de3e27950..b73ab42936 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 && |