mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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
This commit is contained in:
commit
c4f70d2c90
|
@ -140,7 +140,6 @@ static enum commit_whence whence;
|
|||
static int sequencer_in_use;
|
||||
static int use_editor = 1, include_status = 1;
|
||||
static int show_ignored_in_status, have_option_m;
|
||||
static const char *only_include_assumed;
|
||||
static struct strbuf message = STRBUF_INIT;
|
||||
|
||||
static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
|
||||
|
@ -843,9 +842,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
|||
"with '%c' will be kept; you may remove them"
|
||||
" yourself if you want to.\n"
|
||||
"An empty message aborts the commit.\n"), comment_line_char);
|
||||
if (only_include_assumed)
|
||||
status_printf_ln(s, GIT_COLOR_NORMAL,
|
||||
"%s", only_include_assumed);
|
||||
|
||||
/*
|
||||
* These should never fail because they come from our own
|
||||
|
@ -879,8 +875,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;
|
||||
|
@ -1210,8 +1205,6 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
|||
die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
|
||||
if (argc == 0 && (also || (only && !amend && !allow_empty)))
|
||||
die(_("No paths with --include/--only does not make sense."));
|
||||
if (argc > 0 && !also && !only)
|
||||
only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths...");
|
||||
if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
|
||||
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
|
||||
else if (!strcmp(cleanup_arg, "verbatim"))
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue