development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: reword the final message

Browse source 
Ever since the merge command was made multi-strategy aware, we said

    Merge made by octopus.

at the end of a session.  Reword it to

    Merge made by the 'octopus' strategy.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-05-25 12:43:59 -07:00
parent f612a71cc9
commit f23101bf9f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/merge.c
View file

@ -902,7 +902,7 @@ static int finish_automerge(struct commit_list *common,
strbuf_addch(&merge_msg, '\n'); strbuf_addch(&merge_msg, '\n');
run_prepare_commit_msg(); run_prepare_commit_msg();
commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL); commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
strbuf_addf(&buf, "Merge made by %s.", wt_strategy); strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
finish(result_commit, buf.buf); finish(result_commit, buf.buf);
strbuf_release(&buf); strbuf_release(&buf);
drop_save(); drop_save();

6
t/t7602-merge-octopus-many.sh
View file

@ -53,7 +53,7 @@ cat >expected <<\EOF
Trying simple merge with c2 Trying simple merge with c2
Trying simple merge with c3 Trying simple merge with c3
Trying simple merge with c4 Trying simple merge with c4
Merge made by octopus. Merge made by the 'octopus' strategy.
c2.c | 1 + c2.c | 1 +
c3.c | 1 + c3.c | 1 +
c4.c | 1 + c4.c | 1 +
@ -72,7 +72,7 @@ test_expect_success 'merge output uses pretty names' '
cat >expected <<\EOF cat >expected <<\EOF
Already up-to-date with c4 Already up-to-date with c4
Trying simple merge with c5 Trying simple merge with c5
Merge made by octopus. Merge made by the 'octopus' strategy.
c5.c | 1 + c5.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 c5.c create mode 100644 c5.c
@ -86,7 +86,7 @@ test_expect_success 'merge up-to-date output uses pretty names' '
cat >expected <<\EOF cat >expected <<\EOF
Fast-forwarding to: c1 Fast-forwarding to: c1
Trying simple merge with c2 Trying simple merge with c2
Merge made by octopus. Merge made by the 'octopus' strategy.
c1.c | 1 + c1.c | 1 +
c2.c | 1 + c2.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-) 2 files changed, 2 insertions(+), 0 deletions(-)