merge: reword the final message
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>
Junio C Hamano committed
May 25, 2011 at 12:43 UTC
f23101bf9f29d1404fa8ab1cdab619c335cb7f17
2 files changed
+4
-4
builtin/merge.c
+1
-1
@@ -902,7 +902,7 @@ static int finish_automerge(struct commit_list *common,
902
strbuf_addch(&merge_msg, '\n');
903
run_prepare_commit_msg();
904
commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
905
- strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
905
+ strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
906
finish(result_commit, buf.buf);
907
strbuf_release(&buf);
908
drop_save();
t/t7602-merge-octopus-many.sh
+3
-3
@@ -53,7 +53,7 @@ cat >expected <<\EOF
53
Trying simple merge with c2
54
Trying simple merge with c3
55
Trying simple merge with c4
56
-Merge made by octopus.
56
+Merge made by the 'octopus' strategy.
57
c2.c | 1 +
58
c3.c | 1 +
59
c4.c | 1 +
@@ -72,7 +72,7 @@ test_expect_success 'merge output uses pretty names' '
72
cat >expected <<\EOF
73
Already up-to-date with c4
74
Trying simple merge with c5
75
-Merge made by octopus.
75
+Merge made by the 'octopus' strategy.
76
c5.c | 1 +
77
1 files changed, 1 insertions(+), 0 deletions(-)
78
create mode 100644 c5.c
@@ -86,7 +86,7 @@ test_expect_success 'merge up-to-date output uses pretty names' '
86
cat >expected <<\EOF
87
Fast-forwarding to: c1
88
Trying simple merge with c2
89
-Merge made by octopus.
89
+Merge made by the 'octopus' strategy.
90
c1.c | 1 +
91
c2.c | 1 +
92
2 files changed, 2 insertions(+), 0 deletions(-)