kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'tr/merge-edit-guidance' into maint 

* tr/merge-edit-guidance:
  merge: add instructions to the commit message when editing
maint
Junio C Hamano 2012-02-27 15:31:50 -08:00
parent 860f70f9f4 f26af3fcbc
commit 4eed30a7cb
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/merge.c
View File

@ -885,11 +885,21 @@ static void abort_commit(const char *err_msg)
exit(1); exit(1);
} }


static const char merge_editor_comment[] =
N_("Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"\n"
"Lines starting with '#' will be ignored, and an empty message aborts\n"
"the commit.\n");

static void prepare_to_commit(void) static void prepare_to_commit(void)
{ {
struct strbuf msg = STRBUF_INIT; struct strbuf msg = STRBUF_INIT;
const char *comment = _(merge_editor_comment);
strbuf_addbuf(&msg, &merge_msg); strbuf_addbuf(&msg, &merge_msg);
strbuf_addch(&msg, '\n'); strbuf_addch(&msg, '\n');
if (0 < option_edit)
strbuf_add_lines(&msg, "# ", comment, strlen(comment));
write_merge_msg(&msg); write_merge_msg(&msg);
run_hook(get_index_file(), "prepare-commit-msg", run_hook(get_index_file(), "prepare-commit-msg",
git_path("MERGE_MSG"), "merge", NULL, NULL); git_path("MERGE_MSG"), "merge", NULL, NULL);