diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:36:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:36:10 -0700 |
| commit | 1e2600dd6a2acf8d2e9c0923184ca2335b861138 (patch) | |
| tree | 3cf920ef1d92e62eae2b5f7cac17f2045c63fd6c /t/t7502-commit.sh | |
| parent | 075652953772dbabd01d471a4c73200b0ab5d8a6 (diff) | |
| parent | 84c9dc2c5a2d34351a06554af32501d4f99990e9 (diff) | |
| download | git-1e2600dd6a2acf8d2e9c0923184ca2335b861138.tar.gz | |
Merge branch 'nd/status-auto-comment-char'
* nd/status-auto-comment-char:
commit: allow core.commentChar=auto for character auto selection
config: be strict on core.commentChar
Diffstat (limited to 't/t7502-commit.sh')
| -rwxr-xr-x | t/t7502-commit.sh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 6465cd59af..051489ea33 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -570,4 +570,30 @@ test_expect_success 'commit --status with custom comment character' ' test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG ' +test_expect_success 'switch core.commentchar' ' + test_commit "#foo" foo && + GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend && + test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG +' + +test_expect_success 'switch core.commentchar but out of options' ' + cat >text <<\EOF && +# 1 +; 2 +@ 3 +! 4 +$ 5 +% 6 +^ 7 +& 8 +| 9 +: 10 +EOF + git commit --amend -F text && + ( + test_set_editor .git/FAKE_EDITOR && + test_must_fail git -c core.commentChar=auto commit --amend + ) +' + test_done |