diff options
| author | Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> | 2017-06-30 17:42:21 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 07:50:21 -0700 |
| commit | b3cf1b77894861920671def129a981b54ec9618e (patch) | |
| tree | 066f8b9735f54eae4abcbca0db344fa076345205 | |
| parent | b884244c844a5688f9e8de3256143839c7b3c40a (diff) | |
| download | git-b3cf1b77894861920671def129a981b54ec9618e.tar.gz | |
commit-template: distinguish status information unconditionallyks/commit-assuming-only-warning-removal
The commit template adds the status information without
adding a new line to distinguish them in the absence
of optional parts. This results in difficulty in interpreting
it's content, specifically for inexperienced users.
Unconditionally, add new lines to separate the status message
from the other parts of the commit-template to make it more
readable.
Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/commit.c | 3 | ||||
| -rwxr-xr-x | t/t7500-commit.sh | 23 |
2 files changed, 24 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 73b987f968..94d613eaa9 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -873,8 +873,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, (int)(ci.name_end - ci.name_begin), ci.name_begin, (int)(ci.mail_end - ci.mail_begin), ci.mail_begin); - if (ident_shown) - status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); + status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); /* Add new line for clarity */ saved_color_setting = s->use_color; s->use_color = 0; 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 |