mirror of
https://github.com/git/git
synced 2024-10-29 17:08:46 +00:00
commit: remove irrelavent prompt on --allow-empty-message
Even when the `--allow-empty-message` option is given, "git commit" offers an interactive editor session with prefilled message that says the commit will be aborted if the buffer is emptied, which is wrong. Remove the "an empty message aborts" part from the message when the option is given to fix it. Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Helped-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Hu Jialun <hujialun@comp.nus.edu.sg> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
54ba2f1862
commit
6f70f00b4f
2 changed files with 17 additions and 10 deletions
|
@ -889,15 +889,22 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
|
|||
int ident_shown = 0;
|
||||
int saved_color_setting;
|
||||
struct ident_split ci, ai;
|
||||
const char *hint_cleanup_all = _("Please enter the commit message for your changes."
|
||||
" Lines starting\nwith '%c' will be ignored,"
|
||||
" and an empty message aborts the commit.\n");
|
||||
const char *hint_cleanup_space = _("Please enter the commit message for your changes."
|
||||
const char *hint_cleanup_all = allow_empty_message ?
|
||||
_("Please enter the commit message for your changes."
|
||||
" Lines starting\nwith '%c' will be ignored.\n") :
|
||||
_("Please enter the commit message for your changes."
|
||||
" Lines starting\nwith '%c' will be ignored, and an empty"
|
||||
" message aborts the commit.\n");
|
||||
const char *hint_cleanup_space = allow_empty_message ?
|
||||
_("Please enter the commit message for your changes."
|
||||
" Lines starting\n"
|
||||
"with '%c' will be kept; you may remove them"
|
||||
" yourself if you want to.\n") :
|
||||
_("Please enter the commit message for your changes."
|
||||
" Lines starting\n"
|
||||
"with '%c' will be kept; you may remove them"
|
||||
" yourself if you want to.\n"
|
||||
"An empty message aborts the commit.\n");
|
||||
|
||||
if (whence != FROM_COMMIT) {
|
||||
if (cleanup_mode == COMMIT_MSG_CLEANUP_SCISSORS &&
|
||||
!merge_contains_scissors)
|
||||
|
|
|
@ -498,7 +498,7 @@ test_expect_success 'invalid message options when using --fixup' '
|
|||
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.
|
||||
# with '#' will be ignored.
|
||||
#
|
||||
# Author: A U Thor <author@example.com>
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue