mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
commit-template: distinguish status information unconditionally
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>
This commit is contained in:
parent
b884244c84
commit
b3cf1b7789
|
@ -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.name_end - ci.name_begin), ci.name_begin,
|
||||||
(int)(ci.mail_end - ci.mail_begin), ci.mail_begin);
|
(int)(ci.mail_end - ci.mail_begin), ci.mail_begin);
|
||||||
|
|
||||||
if (ident_shown)
|
status_printf_ln(s, GIT_COLOR_NORMAL, "%s", ""); /* Add new line for clarity */
|
||||||
status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
|
|
||||||
|
|
||||||
saved_color_setting = s->use_color;
|
saved_color_setting = s->use_color;
|
||||||
s->use_color = 0;
|
s->use_color = 0;
|
||||||
|
|
|
@ -329,4 +329,27 @@ test_expect_success 'invalid message options when using --fixup' '
|
||||||
test_must_fail git commit --fixup HEAD~1 -F log
|
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
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue