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>

diff --git a/builtin/merge.c b/builtin/merge.c
index 5a2a1eb797c88990337f0b9cbb5dcabc73222a22..8bc453d2f30a72bf664696a20ccf55f3970275c9 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -902,7 +902,7 @@ static int finish_automerge(struct commit_list *common,
        strbuf_addch(&merge_msg, '\n');
        run_prepare_commit_msg();
        commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
        strbuf_addch(&merge_msg, '\n');
        run_prepare_commit_msg();
        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);
        strbuf_release(&buf);
        drop_save();
        finish(result_commit, buf.buf);
        strbuf_release(&buf);
        drop_save();

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 0a46795ae785fd4dfa0e565bfa0153ca107a904d..61f36baa1f3459d68ac30e67680e096093cbe414 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -53,7 +53,7 @@ cat >expected <<\EOF
 Trying simple merge with c2
 Trying simple merge with c3
 Trying simple merge with c4
 Trying simple merge with c2
 Trying simple merge with c3
 Trying simple merge with c4

-Merge made by octopus.
+Merge made by the 'octopus' strategy.

  c2.c |    1 +
  c3.c |    1 +
  c4.c |    1 +
  c2.c |    1 +
  c3.c |    1 +
  c4.c |    1 +


@@ -72,7 +72,7 @@ test_expect_success 'merge output uses pretty names' '
 cat >expected <<\EOF
 Already up-to-date with c4
 Trying simple merge with c5
 cat >expected <<\EOF
 Already up-to-date with c4
 Trying simple merge with c5

-Merge made by octopus.
+Merge made by the 'octopus' strategy.

  c5.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 c5.c
  c5.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 c5.c


@@ -86,7 +86,7 @@ test_expect_success 'merge up-to-date output uses pretty names' '
 cat >expected <<\EOF
 Fast-forwarding to: c1
 Trying simple merge with c2
 cat >expected <<\EOF
 Fast-forwarding to: c1
 Trying simple merge with c2

-Merge made by octopus.
+Merge made by the 'octopus' strategy.

  c1.c |    1 +
  c2.c |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
  c1.c |    1 +
  c2.c |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)