diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:42:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:42:50 -0700 |
| commit | c4f70d2c9025b6dad34d0833a87d8ac24c221956 (patch) | |
| tree | 193a1ddba792ea182d12a269cf9459d86b85b737 /t | |
| parent | 8b2efe2a0fd93b8721879f796d848a9ce785647f (diff) | |
| parent | b3cf1b77894861920671def129a981b54ec9618e (diff) | |
| download | git-c4f70d2c9025b6dad34d0833a87d8ac24c221956.tar.gz | |
Merge branch 'ks/commit-assuming-only-warning-removal'
An old message shown in the commit log template was removed, as it
has outlived its usefulness.
* ks/commit-assuming-only-warning-removal:
commit-template: distinguish status information unconditionally
commit-template: remove outdated notice about explicit paths
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7500-commit.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index 116885a260..5739d3ed23 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -329,4 +329,27 @@ test_expect_success 'invalid message options when using --fixup' ' test_must_fail git commit --fixup HEAD~1 -F log ' +cat >expected-template <<EOF + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Author: A U Thor <author@example.com> +# +# On branch commit-template-check +# Changes to be committed: +# new file: commit-template-check +# +# Untracked files not listed +EOF + +test_expect_success 'new line found before status message in commit template' ' + git checkout -b commit-template-check && + git reset --hard HEAD && + touch commit-template-check && + git add commit-template-check && + GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message && + test_i18ncmp expected-template editor-input +' + test_done |