git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Avoiding 'master' nomenclature
@ 2020-07-29 19:44 Linus Torvalds
  2020-07-29 20:04 ` Junio C Hamano
  0 siblings, 1 reply; 42+ messages in thread
From: Linus Torvalds @ 2020-07-29 19:44 UTC (permalink / raw)
  To: Junio Hamano C, Johannes Schindelin; +Cc: Git List Mailing

It turns out that commit 489947cee5 ("fmt-merge-msg: stop treating
`master` specially") has the exact opposite effect of what the
intention must have been.

It may remove "master" from git, but what it does is then make it much
more visible everywhere else.

In fact, it doesn't even remove "master" from git itself. It just adds
more of it into the test suite etc.

So that commit is doubly stupid. If the intent was to try to avoid
"master" as a word, it failed on every single possible level.

The code that it removed was the code that actively _avoided_ using
"master" naming, for chrissake.

                   Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 19:44 Avoiding 'master' nomenclature Linus Torvalds
@ 2020-07-29 20:04 ` Junio C Hamano
  2020-07-29 20:23   ` Linus Torvalds
  0 siblings, 1 reply; 42+ messages in thread
From: Junio C Hamano @ 2020-07-29 20:04 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Johannes Schindelin, Git List Mailing

Linus Torvalds <torvalds@linux-foundation.org> writes:

> It turns out that commit 489947cee5 ("fmt-merge-msg: stop treating
> `master` specially") has the exact opposite effect of what the
> intention must have been.
>
> It may remove "master" from git, but what it does is then make it much
> more visible everywhere else.
>
> In fact, it doesn't even remove "master" from git itself. It just adds
> more of it into the test suite etc.
>
> So that commit is doubly stupid. If the intent was to try to avoid
> "master" as a word, it failed on every single possible level.

The intent was to stop treating 'master' as some kind of 'special'
word, since it is no longer special after init.defaultBranchName was
invented.

It could have been coded to start treating the word that is set to
init.defaultBranchName as a new 'special' word, but the chosen
design is to say there is no special branch name anywhere.  One
reason behind that design is because the concept of "one thing being
special among all others" does not necessarily hold in all projects
anyway.


^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:04 ` Junio C Hamano
@ 2020-07-29 20:23   ` Linus Torvalds
  2020-07-29 20:38     ` Jonathan Nieder
                       ` (2 more replies)
  0 siblings, 3 replies; 42+ messages in thread
From: Linus Torvalds @ 2020-07-29 20:23 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 1:05 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> The intent was to stop treating 'master' as some kind of 'special'
> word, since it is no longer special after init.defaultBranchName was
> invented.

I understand it happened.

I just think it's simplistic and wrong, and outright stupid, exactly
because it effectively does the exact opposite of what you should do
if you feel that "master" is a bad default.

Yes, the old code hid "master" not because of any language worries,
but simply because it was the default branch and thus useless noise.

So the patch does something doubly wrong:

 (a) it doesn't hide the (to some) offensive terminology, quite the reverse

 (b) it now adds back the useless noise

and while I understand why that happened, I can't but feel that it was
incredibly pointless and badly done.

What *should* have happened is to hide *both* the new
defaultBranchName, _and_ if that wasn't set, "master".

Even if you don't want to treat "master" specially, there's two actual
reasons to do so:

 (a) the technical one: it's the old default one in a lot of existing
repositories, so if there is no defaultBranchName, it effectively
_was_ that

 (b) the non-technical one: if the aim is to get rid of "master"
terminology, THAT IS EXACTLY what the code did before it was removed.

So really. Both from a technical _and_ a terminology angle, that
commit was just wrong.

             Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:23   ` Linus Torvalds
@ 2020-07-29 20:38     ` Jonathan Nieder
  2020-07-29 20:46       ` Linus Torvalds
  2020-07-30  8:17       ` lego_12239
  2020-07-29 20:40     ` Linus Torvalds
  2020-07-29 20:40     ` Junio C Hamano
  2 siblings, 2 replies; 42+ messages in thread
From: Jonathan Nieder @ 2020-07-29 20:38 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

Hi Linus,

Linus Torvalds wrote:
> On Wed, Jul 29, 2020 at 1:05 PM Junio C Hamano <gitster@pobox.com> wrote:

>> The intent was to stop treating 'master' as some kind of 'special'
>> word, since it is no longer special after init.defaultBranchName was
>> invented.
>
> I understand it happened.
>
> I just think it's simplistic and wrong, and outright stupid, exactly
> because it effectively does the exact opposite of what you should do
> if you feel that "master" is a bad default.

I know that "on the internet no one can hear you being subtle", but the
following is not about subtlety:

Repeatedly describing this change as wrong, stupid, simple-minded,
pointless, etc is not making your point any more clearly than if you
were to describe how this change is affecting your workflow.

In fact, in this thread you haven't described it yet.  I assume your
point is that you find the message it writes to be ugly?  If so, why not
say that, instead of describing how the change doesn't do what you
believe it should do?

The commit message describes its intent

  commit 489947cee5095b168cbac111ff7bd1eadbbd90dd
  Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
  Date:   Tue Jun 23 22:33:23 2020 +0000

      fmt-merge-msg: stop treating `master` specially

      In the context of many projects renaming their primary branch names away
      from `master`, Git wants to stop treating the `master` branch specially.

which is *not* about treating "master" as a forbidden word.  All that
said, I do think it can make sense to make these merge messages less
noisy, for example by keying on a setting like init.defaultBranchName
as Junio suggested.

What would help in figuring out how to do that is, instead of more
reminders of how stupid we are, some more information about what would
be useful for you (both directly in your use of git and indirectly in
the history you would like to have available to you for pulling).

Thanks,
Jonathan

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:23   ` Linus Torvalds
  2020-07-29 20:38     ` Jonathan Nieder
@ 2020-07-29 20:40     ` Linus Torvalds
  2020-07-29 20:58       ` Jeff King
  2020-07-29 20:40     ` Junio C Hamano
  2 siblings, 1 reply; 42+ messages in thread
From: Linus Torvalds @ 2020-07-29 20:40 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Johannes Schindelin, Git List Mailing

[-- Attachment #1: Type: text/plain, Size: 625 bytes --]

On Wed, Jul 29, 2020 at 1:23 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> So really. Both from a technical _and_ a terminology angle, that
> commit was just wrong.

So here's the fix.

The fix is effectively a revert of the patch (and a follow-up
test-case patch), and instead just replaces the "master" nomenclature
with "git_default_branch_name()".

This patch actually removes more uses of "master" than it adds to git,
and unlike the patches it replaces, actually removes it from other
projects commit logs.

Now whatever default branch name you choose really is immaterial.

Please?

              Linus

[-- Attachment #2: 0001-Don-t-bother-showing-default-branch-name-in-the-merg.patch --]
[-- Type: text/x-patch, Size: 32496 bytes --]

From 4c96a67d64a21f5cf5ed5e697953cba99f131ae2 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jul 2020 12:45:06 -0700
Subject: [PATCH] Don't bother showing default branch name in the merge message

This effectively reverts commits 489947cee5 ("fmt-merge-msg: stop
treating `master` specially") and 508fd8e8ba ("contrib: subtree: adjust
test to change in fmt-merge-msg"), and replaces them with what git
always used to do: not showing the default branch name in the merge
message (because it's the default one).

That actually has the effect of not treating "master" differently, and
unlike the original commits, actually _removes_ uses of "master" from
the tests and the code.

Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 contrib/subtree/t/t7900-subtree.sh            |  6 +-
 fmt-merge-msg.c                               |  5 +-
 t/t1507-rev-parse-upstream.sh                 |  2 +-
 t/t4013-diff-various.sh                       |  4 +-
 t/t4013/diff.log_--decorate=full_--all        |  2 +-
 t/t4013/diff.log_--decorate_--all             |  2 +-
 ...--patch-with-stat_--summary_master_--_dir_ |  2 +-
 t/t4013/diff.log_--patch-with-stat_master     |  2 +-
 .../diff.log_--patch-with-stat_master_--_dir_ |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ..._--root_--patch-with-stat_--summary_master |  2 +-
 .../diff.log_--root_--patch-with-stat_master  |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4013/diff.log_--root_-p_master             |  2 +-
 t/t4013/diff.log_--root_master                |  2 +-
 t/t4013/diff.log_-m_-p_--first-parent_master  |  2 +-
 t/t4013/diff.log_-m_-p_master                 |  4 +-
 t/t4013/diff.log_-p_--first-parent_master     |  2 +-
 t/t4013/diff.log_-p_master                    |  2 +-
 t/t4013/diff.log_master                       |  2 +-
 t/t4013/diff.show_--first-parent_master       |  2 +-
 t/t4013/diff.show_-c_master                   |  2 +-
 t/t4013/diff.show_-m_master                   |  4 +-
 t/t4013/diff.show_master                      |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4202-log.sh                                | 72 +++++++++----------
 t/t6200-fmt-merge-msg.sh                      | 36 +++++-----
 t/t7600-merge.sh                              | 14 ++--
 t/t7608-merge-messages.sh                     | 10 +--
 30 files changed, 99 insertions(+), 98 deletions(-)

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 53d7accf94..57ff4b25c1 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -196,8 +196,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
 		cd "$subtree_test_count" &&
 		git fetch ./"sub proj" master &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
-		check_equal "$(last_commit_message)" \
-			"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
+		check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
 	)
 '
 
@@ -274,8 +273,7 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
 		cd "$test_count" &&
 		git fetch ./subproj master &&
 		git subtree merge --prefix=subdir/ FETCH_HEAD &&
-		check_equal "$(last_commit_message)" \
-			"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
+		check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
 	)
 '
 
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index cfb8ff2f33..8c5b5fd019 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -451,7 +451,10 @@ static void fmt_merge_msg_title(struct strbuf *out,
 			strbuf_addf(out, " of %s", srcs.items[i].string);
 	}
 
-	strbuf_addf(out, " into %s\n", current_branch);
+	if (!strcmp(git_default_branch_name(), current_branch))
+		strbuf_addch(out, '\n');
+	else
+		strbuf_addf(out, " into %s\n", current_branch);
 }
 
 static void fmt_tag_signature(struct strbuf *tagbuf,
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index f213aa8053..dfc0d96d8a 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -137,7 +137,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
 	git branch -t new my-side@{u} &&
 	git merge -s ours new@{u} &&
 	git show -s --pretty=tformat:%s >actual &&
-	echo "Merge remote-tracking branch ${SQ}origin/side${SQ} into master" >expect &&
+	echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
 	test_cmp expect actual
 )
 '
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 43267d6024..3f60f7d96c 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -117,12 +117,12 @@ test_expect_success setup '
 
 : <<\EOF
 ! [initial] Initial
- * [master] Merge branch 'side' into master
+ * [master] Merge branch 'side'
   ! [rearrange] Rearranged lines in dir/sub
    ! [side] Side
 ----
   +  [rearrange] Rearranged lines in dir/sub
- -   [master] Merge branch 'side' into master
+ -   [master] Merge branch 'side'
  * + [side] Side
  *   [master^] Third
  *   [master~2] Second
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index c56783b985..3f9b872ece 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index 1cbdc038f4..f5e20e1e14 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
index f5b1b6516b..a18f1472a9 100644
--- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master
index af23803cdc..ae425c4672 100644
--- a/t/t4013/diff.log_--patch-with-stat_master
+++ b/t/t4013/diff.log_--patch-with-stat_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
index 814098fbf8..d5207cadf4 100644
--- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
index b927fe4a98..0fc1e8cd71 100644
--- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
index 6db3cea329..dffc09dde9 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master
index 98e9c320c3..55aa98012d 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
index b61b1117ae..019d85f7de 100644
--- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_master
index 345bd9e8a9..b42c334439 100644
--- a/t/t4013/diff.log_--root_-p_master
+++ b/t/t4013/diff.log_--root_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_master
index db56b1fe6b..e8f46159da 100644
--- a/t/t4013/diff.log_--root_master
+++ b/t/t4013/diff.log_--root_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_master
index bcadb50e26..7a0073f529 100644
--- a/t/t4013/diff.log_-m_-p_--first-parent_master
+++ b/t/t4013/diff.log_-m_-p_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_master
index 2acf43a9fb..9ca62a01ed 100644
--- a/t/t4013/diff.log_-m_-p_master
+++ b/t/t4013/diff.log_-m_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
@@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index 7289e35..992913c 100644
diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
index c6a5876d80..3fc896d424 100644
--- a/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_master
index 1841cded94..bf1326dc36 100644
--- a/t/t4013/diff.log_-p_master
+++ b/t/t4013/diff.log_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_master
index f8ec445eb3..a8f6ce5abd 100644
--- a/t/t4013/diff.log_master
+++ b/t/t4013/diff.log_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.show_--first-parent_master b/t/t4013/diff.show_--first-parent_master
index 94548f4598..3dcbe473a0 100644
--- a/t/t4013/diff.show_--first-parent_master
+++ b/t/t4013/diff.show_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
diff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_master
index 1c46ed64fd..81aba8da96 100644
--- a/t/t4013/diff.show_-c_master
+++ b/t/t4013/diff.show_-c_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --combined dir/sub
 index cead32e,7289e35..992913c
diff --git a/t/t4013/diff.show_-m_master b/t/t4013/diff.show_-m_master
index 7559fc22f8..4ea2ee453d 100644
--- a/t/t4013/diff.show_-m_master
+++ b/t/t4013/diff.show_-m_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
@@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index 7289e35..992913c 100644
diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master
index 57091c5d90..fb08ce0e46 100644
--- a/t/t4013/diff.show_master
+++ b/t/t4013/diff.show_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --cc dir/sub
 index cead32e,7289e35..992913c
diff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
index 5f13a71bb5..30aae7817b 100644
--- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
index 8acb88267b..d1d32bd34c 100644
--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index fd9af658af..a0930599aa 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -483,7 +483,7 @@ test_expect_success 'set up merge history' '
 '
 
 cat > expect <<\EOF
-*   Merge branch 'side' into master
+*   Merge branch 'side'
 |\
 | * side-2
 | * side-1
@@ -502,7 +502,7 @@ test_expect_success 'log --graph with merge' '
 '
 
 cat > expect <<\EOF
-| | | *   Merge branch 'side' into master
+| | | *   Merge branch 'side'
 | | | |\
 | | | | * side-2
 | | | | * side-1
@@ -521,7 +521,7 @@ test_expect_success 'log --graph --line-prefix="| | | " with merge' '
 '
 
 cat > expect.colors <<\EOF
-*   Merge branch 'side' into master
+*   Merge branch 'side'
 <BLUE>|<RESET><CYAN>\<RESET>
 <BLUE>|<RESET> * side-2
 <BLUE>|<RESET> * side-1
@@ -555,7 +555,7 @@ cat > expect <<\EOF
 |\  Merge: A B
 | | Author: A U Thor <author@example.com>
 | |
-| |     Merge branch 'side' into master
+| |     Merge branch 'side'
 | |
 | * commit tags/side-2
 | | Author: A U Thor <author@example.com>
@@ -632,11 +632,11 @@ test_expect_success 'set up more tangled history' '
 '
 
 cat > expect <<\EOF
-*   Merge tag 'reach' into master
+*   Merge tag 'reach'
 |\
 | \
 |  \
-*-. \   Merge tags 'octopus-a' and 'octopus-b' into master
+*-. \   Merge tags 'octopus-a' and 'octopus-b'
 |\ \ \
 * | | | seventh
 | | * | octopus-b
@@ -646,14 +646,14 @@ cat > expect <<\EOF
 |/ /
 | * reach
 |/
-*   Merge branch 'tangle' into master
+*   Merge branch 'tangle'
 |\
 | *   Merge branch 'side' (early part) into tangle
 | |\
 | * \   Merge branch 'master' (early part) into tangle
 | |\ \
 | * | | tangle-a
-* | | |   Merge branch 'side' into master
+* | | |   Merge branch 'side'
 |\ \ \ \
 | * | | | side-2
 | | |_|/
@@ -735,16 +735,16 @@ test_expect_success 'log.decorate configuration' '
 
 test_expect_success 'decorate-refs with glob' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
 	reach
 	EOF
 	cat >expect.no-decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -765,8 +765,8 @@ test_expect_success 'decorate-refs with glob' '
 
 test_expect_success 'decorate-refs without globs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -779,8 +779,8 @@ test_expect_success 'decorate-refs without globs' '
 
 test_expect_success 'multiple decorate-refs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
@@ -794,8 +794,8 @@ test_expect_success 'multiple decorate-refs' '
 
 test_expect_success 'decorate-refs-exclude with glob' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
 	octopus-a (tag: octopus-a)
@@ -811,8 +811,8 @@ test_expect_success 'decorate-refs-exclude with glob' '
 
 test_expect_success 'decorate-refs-exclude without globs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b, octopus-b)
 	octopus-a (tag: octopus-a, octopus-a)
@@ -828,8 +828,8 @@ test_expect_success 'decorate-refs-exclude without globs' '
 
 test_expect_success 'multiple decorate-refs-exclude' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
 	octopus-a (tag: octopus-a)
@@ -851,8 +851,8 @@ test_expect_success 'multiple decorate-refs-exclude' '
 
 test_expect_success 'decorate-refs and decorate-refs-exclude' '
 	cat >expect.no-decorate <<-\EOF &&
-	Merge-tag-reach-into-master (master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -866,8 +866,8 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' '
 
 test_expect_success 'deocrate-refs and log.excludeDecoration' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
@@ -881,10 +881,10 @@ test_expect_success 'deocrate-refs and log.excludeDecoration' '
 
 test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
+	Merge-tag-reach (HEAD -> master)
 	reach (tag: reach, reach)
 	seventh (tag: seventh)
-	Merge-branch-tangle-into-master
+	Merge-branch-tangle
 	Merge-branch-side-early-part-into-tangle (tangle)
 	tangle-a (tag: tangle-a)
 	EOF
@@ -1068,7 +1068,7 @@ cat >expect <<\EOF
 |\  Merge: MERGE_PARENTS
 | | Author: A U Thor <author@example.com>
 | |
-| |     Merge branch 'tangle' into master
+| |     Merge branch 'tangle'
 | |
 | *   commit COMMIT_OBJECT_NAME
 | |\  Merge: MERGE_PARENTS
@@ -1102,7 +1102,7 @@ cat >expect <<\EOF
 |\ \ \ \  Merge: MERGE_PARENTS
 | | | | | Author: A U Thor <author@example.com>
 | | | | |
-| | | | |     Merge branch 'side' into master
+| | | | |     Merge branch 'side'
 | | | | |
 | * | | | commit COMMIT_OBJECT_NAME
 | | |_|/  Author: A U Thor <author@example.com>
@@ -1343,7 +1343,7 @@ cat >expect <<\EOF
 *** |\  Merge: MERGE_PARENTS
 *** | | Author: A U Thor <author@example.com>
 *** | |
-*** | |     Merge branch 'tangle' into master
+*** | |     Merge branch 'tangle'
 *** | |
 *** | *   commit COMMIT_OBJECT_NAME
 *** | |\  Merge: MERGE_PARENTS
@@ -1377,7 +1377,7 @@ cat >expect <<\EOF
 *** |\ \ \ \  Merge: MERGE_PARENTS
 *** | | | | | Author: A U Thor <author@example.com>
 *** | | | | |
-*** | | | | |     Merge branch 'side' into master
+*** | | | | |     Merge branch 'side'
 *** | | | | |
 *** | * | | | commit COMMIT_OBJECT_NAME
 *** | | |_|/  Author: A U Thor <author@example.com>
@@ -1540,8 +1540,8 @@ cat >expect <<-\EOF
 * reach
 |
 | A	reach.t
-* Merge branch 'tangle' into master
-*   Merge branch 'side' into master
+* Merge branch 'tangle'
+*   Merge branch 'side'
 |\
 | * side-2
 |
@@ -1562,8 +1562,8 @@ cat >expect <<-\EOF
 * reach
 |
 | reach.t
-* Merge branch 'tangle' into master
-*   Merge branch 'side' into master
+* Merge branch 'tangle'
+*   Merge branch 'side'
 |\
 | * side-2
 |
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 2b3fd498d0..e4c2a6eca4 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -79,7 +79,7 @@ test_expect_success GPG 'set up a signed tag' '
 '
 
 test_expect_success 'message for merging local branch' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 
 	git checkout master &&
 	git fetch . left &&
@@ -107,7 +107,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
 '
 
 test_expect_success 'message for merging external branch' '
-	echo "Merge branch ${apos}left${apos} of $(pwd) into master" >expected &&
+	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
 
 	git checkout master &&
 	git fetch "$(pwd)" left &&
@@ -118,7 +118,7 @@ test_expect_success 'message for merging external branch' '
 
 test_expect_success '[merge] summary/log configuration' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -160,7 +160,7 @@ test_expect_success 'setup FETCH_HEAD' '
 
 test_expect_success 'merge.log=3 limits shortlog length' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -177,7 +177,7 @@ test_expect_success 'merge.log=3 limits shortlog length' '
 
 test_expect_success 'merge.log=5 shows all 5 commits' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -195,7 +195,7 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
 
 test_expect_success '--log=5 with custom comment character' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	x By Another Author (3) and A U Thor (2)
 	x Via Another Committer
@@ -212,14 +212,14 @@ test_expect_success '--log=5 with custom comment character' '
 '
 
 test_expect_success 'merge.log=0 disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success '--log=3 limits shortlog length' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -236,7 +236,7 @@ test_expect_success '--log=3 limits shortlog length' '
 
 test_expect_success '--log=5 shows all 5 commits' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -253,13 +253,13 @@ test_expect_success '--log=5 shows all 5 commits' '
 '
 
 test_expect_success '--no-log disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success '--log=0 disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
@@ -300,7 +300,7 @@ test_expect_success 'fmt-merge-msg -m' '
 
 test_expect_success 'setup: expected shortlog for two branches' '
 	cat >expected <<-EOF
-	Merge branches ${apos}left${apos} and ${apos}right${apos} into master
+	Merge branches ${apos}left${apos} and ${apos}right${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -397,7 +397,7 @@ test_expect_success 'merge-msg with nothing to merge' '
 
 test_expect_success 'merge-msg tag' '
 	cat >expected <<-EOF &&
-	Merge tag ${apos}tag-r3${apos} into master
+	Merge tag ${apos}tag-r3${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -418,7 +418,7 @@ test_expect_success 'merge-msg tag' '
 
 test_expect_success 'merge-msg two tags' '
 	cat >expected <<-EOF &&
-	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos} into master
+	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -448,7 +448,7 @@ test_expect_success 'merge-msg two tags' '
 
 test_expect_success 'merge-msg tag and branch' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos} into master
+	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -479,7 +479,7 @@ test_expect_success 'merge-msg tag and branch' '
 test_expect_success 'merge-msg lots of commits' '
 	{
 		cat <<-EOF &&
-		Merge branch ${apos}long${apos} into master
+		Merge branch ${apos}long${apos}
 
 		* long: (35 commits)
 		EOF
@@ -516,7 +516,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	{
 		cat <<-\EOF
-		Merge tag '\''annote'\'' into master
+		Merge tag '\''annote'\''
 
 		An annotated one
 
@@ -531,7 +531,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	git merge --no-commit --no-ff $annote &&
 	{
 		cat <<-EOF
-		Merge tag '\''$annote'\'' into master
+		Merge tag '\''$annote'\''
 
 		An annotated one
 
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1d45f9a4ed..5883a6adc3 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -14,9 +14,9 @@ Testing basic merge operations/option parsing.
     ! [c4] c4
      ! [c5] c5
       ! [c6] c6
-       * [master] Merge commit 'c1' into master
+       * [master] Merge commit 'c1'
 --------
-       - [master] Merge commit 'c1' into master
+       - [master] Merge commit 'c1'
  +     * [c1] commit 1
       +  [c6] c6
      +   [c5] c5
@@ -44,8 +44,8 @@ test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9
 test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z
 
 create_merge_msgs () {
-	echo "Merge tag 'c2' into master" >msg.1-5 &&
-	echo "Merge tags 'c2' and 'c3' into master" >msg.1-5-9 &&
+	echo "Merge tag 'c2'" >msg.1-5 &&
+	echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 &&
 	{
 		echo "Squashed commit of the following:" &&
 		echo &&
@@ -258,7 +258,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
 	git commit --no-edit -a &&
 
 	cat >expect <<-\EOF &&
-	Merge tag '"'"'c7'"'"' into master
+	Merge tag '"'"'c7'"'"'
 
 	# ------------------------ >8 ------------------------
 	# Do not modify or remove the line above.
@@ -808,10 +808,10 @@ test_expect_success 'merge with conflicted --autostash changes' '
 '
 
 cat >expected.branch <<\EOF
-Merge branch 'c5-branch' (early part) into master
+Merge branch 'c5-branch' (early part)
 EOF
 cat >expected.tag <<\EOF
-Merge commit 'c5~1' into master
+Merge commit 'c5~1'
 EOF
 
 test_expect_success 'merge early part of c2' '
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 2af33f195b..8e7e0a5865 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -16,7 +16,7 @@ test_expect_success 'merge local branch' '
 	git checkout master &&
 	test_commit master-2 &&
 	git merge local-branch &&
-	check_oneline "Merge branch Qlocal-branchQ into master"
+	check_oneline "Merge branch Qlocal-branchQ"
 '
 
 test_expect_success 'merge octopus branches' '
@@ -26,7 +26,7 @@ test_expect_success 'merge octopus branches' '
 	test_commit octopus-2 &&
 	git checkout master &&
 	git merge octopus-a octopus-b &&
-	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ into master"
+	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
 '
 
 test_expect_success 'merge tag' '
@@ -35,7 +35,7 @@ test_expect_success 'merge tag' '
 	git checkout master &&
 	test_commit master-3 &&
 	git merge tag-1 &&
-	check_oneline "Merge tag Qtag-1Q into master"
+	check_oneline "Merge tag Qtag-1Q"
 '
 
 test_expect_success 'ambiguous tag' '
@@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' '
 	git checkout master &&
 	test_commit master-4 &&
 	git merge ambiguous &&
-	check_oneline "Merge tag QambiguousQ into master"
+	check_oneline "Merge tag QambiguousQ"
 '
 
 test_expect_success 'remote-tracking branch' '
@@ -54,7 +54,7 @@ test_expect_success 'remote-tracking branch' '
 	git checkout master &&
 	test_commit master-5 &&
 	git merge origin/master &&
-	check_oneline "Merge remote-tracking branch Qorigin/masterQ into master"
+	check_oneline "Merge remote-tracking branch Qorigin/masterQ"
 '
 
 test_done
-- 
2.28.0.4.g1bac1770cd


^ permalink raw reply related	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:23   ` Linus Torvalds
  2020-07-29 20:38     ` Jonathan Nieder
  2020-07-29 20:40     ` Linus Torvalds
@ 2020-07-29 20:40     ` Junio C Hamano
  2020-07-29 20:51       ` Linus Torvalds
  2 siblings, 1 reply; 42+ messages in thread
From: Junio C Hamano @ 2020-07-29 20:40 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Johannes Schindelin, Git List Mailing

Linus Torvalds <torvalds@linux-foundation.org> writes:

> Even if you don't want to treat "master" specially, there's two actual
> reasons to do so:
>
>  (a) the technical one: it's the old default one in a lot of existing
> repositories, so if there is no defaultBranchName, it effectively
> _was_ that
>
>  (b) the non-technical one: if the aim is to get rid of "master"
> terminology, THAT IS EXACTLY what the code did before it was removed.
>
> So really. Both from a technical _and_ a terminology angle, that
> commit was just wrong.

Your "if the aim is" is curious---the change is not particularly
aimed for that.  As far as I understand it, it was also to retire
the "one single thing is special among others" mentality (which by
the way I find somewhat offending).

The original did two things wrong, i.e. treated one thing specially,
and designated 'master' which has been declared a dirty word as that
special thing.  Killing these two wrongs with one stone does not
feel so stupid.

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:38     ` Jonathan Nieder
@ 2020-07-29 20:46       ` Linus Torvalds
  2020-07-29 20:56         ` Linus Torvalds
  2020-07-30  8:17       ` lego_12239
  1 sibling, 1 reply; 42+ messages in thread
From: Linus Torvalds @ 2020-07-29 20:46 UTC (permalink / raw)
  To: Jonathan Nieder; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 1:39 PM Jonathan Nieder <jrnieder@gmail.com> wrote:
>
> What would help in figuring out how to do that is, instead of more
> reminders of how stupid we are, some more information about what would
> be useful for you (both directly in your use of git and indirectly in
> the history you would like to have available to you for pulling).

I've sent the patch. It's "tested" only in the sense that the
test-suite continues to work, but it's really just a revert together
with replacing "master" with using git_default_branch_name() instead.

I would have thought the old behavior was self-explanatory: don't
bother saying that you're merging into the default branch, because the
default branch name is - wait for it - not interesting.

And yes, I was annoyed by this, and sorry for calling it stupid.

But I was annoyed by this because it took me much too long to notice
that my merge messages are now unnecessarily ugly for the last two
days, for a _very_ bad reason.

And I'm annoyed because I agree that "master" isn't a great default
name, and I treat it as historical. So then making that
less-than-great name more visible in the history is actually really
sad, in addition to being just ugly.

            Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:40     ` Junio C Hamano
@ 2020-07-29 20:51       ` Linus Torvalds
  0 siblings, 0 replies; 42+ messages in thread
From: Linus Torvalds @ 2020-07-29 20:51 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 1:40 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> The original did two things wrong, i.e. treated one thing specially,
> and designated 'master' which has been declared a dirty word as that
> special thing.  Killing these two wrongs with one stone does not
> feel so stupid.

So here's basically the totality of the patch I just sent out, if you
ignore the reverts for all the side effects of the bad fix:

  -       if (!strcmp("master", current_branch))
  +       if (!strcmp(git_default_branch_name(), current_branch))

See? It fixes both issues, _and_ it doesn't break any test-suite or
any existing actual users.

So compare that one-liner fix with the commit I'm complaining about:

  git show 489947cee5

which broke actual existing users.

And then tell me which one is the proper fix.

Breaking existing users? Or just fixing the issue with a clean and
obvious one-liner?

           Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:46       ` Linus Torvalds
@ 2020-07-29 20:56         ` Linus Torvalds
  0 siblings, 0 replies; 42+ messages in thread
From: Linus Torvalds @ 2020-07-29 20:56 UTC (permalink / raw)
  To: Jonathan Nieder; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 1:46 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> But I was annoyed by this because it took me much too long to notice
> that my merge messages are now unnecessarily ugly for the last two
> days, for a _very_ bad reason.

sed s/days/weeks/

I guess that shows how much I look at the boiler-plate.

I try to make my merge messages readable and spend actual effort on
formatting etc, but take all the git-provided stuff for granted.

This violated that trust.

           Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:40     ` Linus Torvalds
@ 2020-07-29 20:58       ` Jeff King
  2020-07-29 21:20         ` Linus Torvalds
  2020-07-29 21:25         ` Junio C Hamano
  0 siblings, 2 replies; 42+ messages in thread
From: Jeff King @ 2020-07-29 20:58 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 01:40:17PM -0700, Linus Torvalds wrote:

> > So really. Both from a technical _and_ a terminology angle, that
> > commit was just wrong.
> 
> So here's the fix.
> 
> The fix is effectively a revert of the patch (and a follow-up
> test-case patch), and instead just replaces the "master" nomenclature
> with "git_default_branch_name()".
> 
> This patch actually removes more uses of "master" than it adds to git,
> and unlike the patches it replaces, actually removes it from other
> projects commit logs.
> 
> Now whatever default branch name you choose really is immaterial.

I don't think that covers all cases.

If I set init.defaultBranch, then that only sets the default branch name
for new repositories I create with "git init". But I may still interact
with many repositories that use a different name (either "master", or
other names chosen by individual projects).

If you suppressed the output for both "master" and
git_default_branch_name(), that would cover more cases, at the expense
of occasionally doing the wrong thing when some project uses "master"
but doesn't mean for it to be a default branch (but that's presumably
rare).  It would still do the wrong thing if you prefer "foo" as the
default branch name for your projects, but sometimes work on a project
that prefers "bar".

Users can set init.defaultBranch in individual repository config files
to get the right behavior, though probably it should be a separate
config variable (the reason it is init.defaultBranch and not
core.defaultBranch is that you may want different defaults for different
operations).

So I think a path forward is more like:

  1. Add a new config option to shorten fmt-merge-msg's output when the
     destination branch matches it (and this should perhaps not even be
     a single name, but a set of globs, which supports more workflows).
     Call it merge.suppressDest or something.

  2. Optionally a repository created with "git init" could copy its
     init.defaultBranch into merge.suppressDest. And likewise a clone
     might copy the remote HEAD into that variable. I'm not sure if that
     is worth doing or not, but it would restore the original behavior
     for the most part.

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:58       ` Jeff King
@ 2020-07-29 21:20         ` Linus Torvalds
  2020-07-30  0:29           ` Jeff King
  2020-07-29 21:25         ` Junio C Hamano
  1 sibling, 1 reply; 42+ messages in thread
From: Linus Torvalds @ 2020-07-29 21:20 UTC (permalink / raw)
  To: Jeff King; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 1:58 PM Jeff King <peff@peff.net> wrote:
>
> Users can set init.defaultBranch in individual repository config files
> to get the right behavior, though probably it should be a separate
> config variable (the reason it is init.defaultBranch and not
> core.defaultBranch is that you may want different defaults for different
> operations).

That would probably be even better, yes.

It's hard to tell what the default branch of any _particular_ repo is, though.

One option that I considered was to just suppress both "master"
(because that's clearly an old default value) _and_ the new
git_default_branch_name() (as the new default value).

But you're right that you can then interact with systems that have
used yet other defaults.

That said, I still claim that my one-liner is better than what
actually got merged.

> So I think a path forward is more like:
>
>   1. Add a new config option to shorten fmt-merge-msg's output when the
>      destination branch matches it (and this should perhaps not even be
>      a single name, but a set of globs, which supports more workflows).
>      Call it merge.suppressDest or something.

On that note, I have a special

   .git/hooks/prepare-commit-msg

in my tree, because I want to regularly replace the URL I pull from.

In particular, for kernel.org, I actually pull through the
non-public-facing master machine (because that way I don't encounter
mirroring delays etc, and since I don't _require_ that people sign
their kernel.org trees, I want to make sure nobody does any spoofing).

So I use the "url.X.insteadOf" git config functionality to do the
replacement of the URL on the incoming side.

But for the merge messages, I want to do the reverse, and don't want
to expose those not-usable-to-others addresses, so I replace that ssh
access with the public-facing "git://git.kernel.org/" instead.

I use that prepare-commit-msg hook to do that.

I *could* have done that for branch names too, but that is something
that git has done right for the last 15+ years, so I never had to
worry or think about it.

But a generic replacement (or generation) machinery for the whole line
would be lovely. And then perhaps just _default_ that regex to be the
equivalent of

   sed 's/ into master$//'

would work really well not just for the branch name prettification,
but also for things like that "internal vs external hostnames".

>   2. Optionally a repository created with "git init" could copy its
>      init.defaultBranch into merge.suppressDest. And likewise a clone
>      might copy the remote HEAD into that variable. I'm not sure if that
>      is worth doing or not, but it would restore the original behavior
>      for the most part.

Well, the real objection I have to that commit 489947cee5 is that it
breaks existing users workflow.

So some way of suppressing "into master" by default should be part of
the solution regardless.

Making it optional, so that people who *want* to show the default
branch name can do so, and specify what it is, that sounds like a good
idea.

But breaking existing users - that I find to be very objectionable.

                  Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:58       ` Jeff King
  2020-07-29 21:20         ` Linus Torvalds
@ 2020-07-29 21:25         ` Junio C Hamano
  2020-07-29 22:50           ` Junio C Hamano
  1 sibling, 1 reply; 42+ messages in thread
From: Junio C Hamano @ 2020-07-29 21:25 UTC (permalink / raw)
  To: Jeff King; +Cc: Linus Torvalds, Johannes Schindelin, Git List Mailing

Jeff King <peff@peff.net> writes:

> If I set init.defaultBranch, then that only sets the default branch name
> for new repositories I create with "git init". But I may still interact
> with many repositories that use a different name (either "master", or
> other names chosen by individual projects).

Yup, in a very early iteration, we had two such configuration.  The
name 'git init' uses when not told what branch name to use from the
command line, which became init.defaultBranchName, which does not
make sense in per-repo configuration.  The other is to specify which
branch to treat specifically in the repository for a very small
number of operations (namely, fmt-merge-msg and anonymization for
fast-export).  What we ended up was with a single configuration, not
treating just one single branch as special in an existing repository.

The fast-export side lifted the "single branch is special"; we
didn't do something similar for "fmt-merge-msg".

> So I think a path forward is more like:
>
>   1. Add a new config option to shorten fmt-merge-msg's output when the
>      destination branch matches it (and this should perhaps not even be
>      a single name, but a set of globs, which supports more workflows).
>      Call it merge.suppressDest or something.
>
>   2. Optionally a repository created with "git init" could copy its
>      init.defaultBranch into merge.suppressDest. And likewise a clone
>      might copy the remote HEAD into that variable. I'm not sure if that
>      is worth doing or not, but it would restore the original behavior
>      for the most part.

Yeah, that sounds like a good plan.

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 21:25         ` Junio C Hamano
@ 2020-07-29 22:50           ` Junio C Hamano
  2020-07-30  0:14             ` Jeff King
  2020-07-30  0:36             ` Junio C Hamano
  0 siblings, 2 replies; 42+ messages in thread
From: Junio C Hamano @ 2020-07-29 22:50 UTC (permalink / raw)
  To: Jeff King; +Cc: Linus Torvalds, Johannes Schindelin, Git List Mailing

Junio C Hamano <gitster@pobox.com> writes:

> The fast-export side lifted the "single branch is special"; we
> didn't do something similar for "fmt-merge-msg".
>
>> So I think a path forward is more like:
>>
>>   1. Add a new config option to shorten fmt-merge-msg's output when the
>>      destination branch matches it (and this should perhaps not even be
>>      a single name, but a set of globs, which supports more workflows).
>>      Call it merge.suppressDest or something.
>>
>>   2. Optionally a repository created with "git init" could copy its
>>      init.defaultBranch into merge.suppressDest. And likewise a clone
>>      might copy the remote HEAD into that variable. I'm not sure if that
>>      is worth doing or not, but it would restore the original behavior
>>      for the most part.
>
> Yeah, that sounds like a good plan.

A rough outline I did while waiting for today's integration builds
to finish looks like this, which does not look _too_ bad.  We can
replace the literal 'master' with the default branch name determined
at runtime, but I am not sure if that is needed.

 fmt-merge-msg.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index cfb8ff2f33..b99699eacc 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -10,6 +10,8 @@
 #include "commit-reach.h"
 
 static int use_branch_desc;
+static int suppress_dest_pattern_seen;
+static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
 
 int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 {
@@ -22,6 +24,12 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 			merge_log_config = DEFAULT_MERGE_LOG_LEN;
 	} else if (!strcmp(key, "merge.branchdesc")) {
 		use_branch_desc = git_config_bool(key, value);
+	} else if (!strcmp(key, "merge.suppressdest")) {
+		if (!value)
+			string_list_clear(&suppress_dest_patterns, 0);
+		else
+			string_list_append(&suppress_dest_patterns, value);
+		suppress_dest_pattern_seen = 1;
 	} else {
 		return git_default_config(key, value, cb);
 	}
@@ -408,6 +416,8 @@ static void fmt_merge_msg_title(struct strbuf *out,
 {
 	int i = 0;
 	char *sep = "";
+	struct string_list_item *item;
+	int suppress_merge_dest = 0;
 
 	strbuf_addstr(out, "Merge ");
 	for (i = 0; i < srcs.nr; i++) {
@@ -451,7 +461,15 @@ static void fmt_merge_msg_title(struct strbuf *out,
 			strbuf_addf(out, " of %s", srcs.items[i].string);
 	}
 
-	strbuf_addf(out, " into %s\n", current_branch);
+	for_each_string_list_item(item, &suppress_dest_patterns) {
+		if (!wildmatch(item->string, current_branch, WM_PATHNAME)) {
+			suppress_merge_dest = 1;
+			break;
+		}
+	}
+
+	if (!suppress_merge_dest)
+		strbuf_addf(out, " into %s\n", current_branch);
 }
 
 static void fmt_tag_signature(struct strbuf *tagbuf,
@@ -596,6 +614,9 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 	void *current_branch_to_free;
 	struct merge_parents merge_parents;
 
+	if (!suppress_dest_pattern_seen)
+		string_list_append(&suppress_dest_patterns, "master");
+
 	memset(&merge_parents, 0, sizeof(merge_parents));
 
 	/* get current branch */

^ permalink raw reply related	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 22:50           ` Junio C Hamano
@ 2020-07-30  0:14             ` Jeff King
  2020-07-30  0:23               ` Linus Torvalds
  2020-07-30  0:31               ` Jeff King
  2020-07-30  0:36             ` Junio C Hamano
  1 sibling, 2 replies; 42+ messages in thread
From: Jeff King @ 2020-07-30  0:14 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Linus Torvalds, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 03:50:01PM -0700, Junio C Hamano wrote:

> Junio C Hamano <gitster@pobox.com> writes:
> 
> > The fast-export side lifted the "single branch is special"; we
> > didn't do something similar for "fmt-merge-msg".
> >
> >> So I think a path forward is more like:
> >>
> >>   1. Add a new config option to shorten fmt-merge-msg's output when the
> >>      destination branch matches it (and this should perhaps not even be
> >>      a single name, but a set of globs, which supports more workflows).
> >>      Call it merge.suppressDest or something.
> >>
> >>   2. Optionally a repository created with "git init" could copy its
> >>      init.defaultBranch into merge.suppressDest. And likewise a clone
> >>      might copy the remote HEAD into that variable. I'm not sure if that
> >>      is worth doing or not, but it would restore the original behavior
> >>      for the most part.
> >
> > Yeah, that sounds like a good plan.
> 
> A rough outline I did while waiting for today's integration builds
> to finish looks like this, which does not look _too_ bad.  We can
> replace the literal 'master' with the default branch name determined
> at runtime, but I am not sure if that is needed.

This looks like a good direction overall.

I'm on the fence on how magical to make the default. Having "master"
there gets Linus's case back where he wanted without having to configure
anything, which is probably reasonable. I'm not sure if people would
want their init.defaultBranch in addition / instead. Since it's a list
it's tempting to say that those could be added to the list even if the
user has specified some value, but I guess that makes things awkward if
you don't want them (I see you put in a way to clear the list, which is
good; I'm more talking about the fact that people would have to actually
remember to do so in their config).

Just a few comments on the patch itself:

>  fmt-merge-msg.c | 23 ++++++++++++++++++++++-
>  1 file changed, 22 insertions(+), 1 deletion(-)

Tests and docs, obviously, but I know this is just a preview. :)

> +	} else if (!strcmp(key, "merge.suppressdest")) {
> +		if (!value)
> +			string_list_clear(&suppress_dest_patterns, 0);
> +		else
> +			string_list_append(&suppress_dest_patterns, value);
> +		suppress_dest_pattern_seen = 1;

I kind of hate the option name, despite being the one who suggested it.
But I don't have anything better. I do like naming it after the specific
action we plan to use it for, and not some "these are default branches"
list, which is too vague.

> @@ -451,7 +461,15 @@ static void fmt_merge_msg_title(struct strbuf *out,
>  			strbuf_addf(out, " of %s", srcs.items[i].string);
>  	}
>  
> -	strbuf_addf(out, " into %s\n", current_branch);
> +	for_each_string_list_item(item, &suppress_dest_patterns) {
> +		if (!wildmatch(item->string, current_branch, WM_PATHNAME)) {
> +			suppress_merge_dest = 1;
> +			break;
> +		}
> +	}

I think a list with globs should be plenty flexible. I really hope
nobody would need to include "foo*" but exclude "*bar" from that. If
they do they can write that patch later.

I think this will be matching branch names, not fully qualified refs.
Seems reasonable, but we should be sure to document that.

This loop might be nicer in a helper function with an early return, if
only to avoid extra local variables in fmt_merge_msg_title().

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:14             ` Jeff King
@ 2020-07-30  0:23               ` Linus Torvalds
  2020-07-30 10:11                 ` Michal Suchánek
  2020-07-30  0:31               ` Jeff King
  1 sibling, 1 reply; 42+ messages in thread
From: Linus Torvalds @ 2020-07-30  0:23 UTC (permalink / raw)
  To: Jeff King; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 5:14 PM Jeff King <peff@peff.net> wrote:
>
> I'm on the fence on how magical to make the default. Having "master"
> there gets Linus's case back where he wanted without having to configure
> anything, which is probably reasonable. I'm not sure if people would
> want their init.defaultBranch in addition / instead.

Junio seemed to go for "instead", but I think it might be more natural
to just have "master" as the initial entry, and anybody adding entries
will add it to the list.

I do think it might be a good idea to make "git init" just add the
entry from whatever the default initial branch is.

And then the "empty entry to clear" can be used to _force_ a clean
slate, although I don't see why anybody would ever really want that.
If you make your default branch name be "develop", and you really want
to see the "into develop", you'd remove the entry that "git init"
would hypothetically add, you wouldn't necessarily want to do a "clear
list".

I assume that "clear list" was maybe done because somebody would put a
list of entries into their global .gitconfig file, and then a
particular repo would override it by clearing it? It might be better
to make it clear that it's just a bad idea to make some global list,
and this should normally just be a per-repo setting?

Git hasn't had that "into master" for a long time, and I don't think
anybody has ever asked for it, so I don't think that legacy entry is
something you'd find people wanting to clear just to see that message.

            Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 21:20         ` Linus Torvalds
@ 2020-07-30  0:29           ` Jeff King
  2020-07-30  0:44             ` Linus Torvalds
  0 siblings, 1 reply; 42+ messages in thread
From: Jeff King @ 2020-07-30  0:29 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 02:20:07PM -0700, Linus Torvalds wrote:

> I use that prepare-commit-msg hook to do that.
> 
> I *could* have done that for branch names too, but that is something
> that git has done right for the last 15+ years, so I never had to
> worry or think about it.

Yeah, I think that "just use a hook" is not the right response here.
Hooks are great for making hard or uncommon things possible, but we
should still be making easy things easy. If tweaking this part of the
merge msg in a standard way is something many people want to do, it's
much friendlier for us to provide a config option that does that.

> But a generic replacement (or generation) machinery for the whole line
> would be lovely. And then perhaps just _default_ that regex to be the
> equivalent of
> 
>    sed 's/ into master$//'
> 
> would work really well not just for the branch name prettification,
> but also for things like that "internal vs external hostnames".

This is an interesting middle ground. I'm a little iffy on it just
because it complicates the very simple case of "should I mention the
destination branch", which is what I'd expect most people to care about.
That it also solves your "tweak the source branch" problem is
interesting, but I'm not sure how many people will care (i.e., enough to
justify the extra complication).

> >   2. Optionally a repository created with "git init" could copy its
> >      init.defaultBranch into merge.suppressDest. And likewise a clone
> >      might copy the remote HEAD into that variable. I'm not sure if that
> >      is worth doing or not, but it would restore the original behavior
> >      for the most part.
> 
> Well, the real objection I have to that commit 489947cee5 is that it
> breaks existing users workflow.

I'm not entirely onboard with the characterization of "breaking
workflows". Yes, the result is _different_, but it's mostly a matter of
aesthetics. I'd be more convinced it was a breakage if we were somehow
leaking information about the workflows. E.g., if you merge on a
detached HEAD and then fast-forward your branch to match and you get an
ugly "into HEAD", that might be bad. But nothing changed there (we do
give you the ugly "into HEAD" ;) ). The case that changed is conveying
the same information as before, just more verbosely (by saying the
branch name instead of implying it by omission).

It may be a matter of perspective / opinion, though. And I don't know
that we even need to come to an agreement on it. Whether we treat it as
a feature to suppress the mention of the destination branch, or a
bug-fix to correct a regression, the end result is the same (and to be
clear, I'm on board with doing it in a way that defaults to handling
"master", which is a key part of those two things being equivalent).

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:14             ` Jeff King
  2020-07-30  0:23               ` Linus Torvalds
@ 2020-07-30  0:31               ` Jeff King
  1 sibling, 0 replies; 42+ messages in thread
From: Jeff King @ 2020-07-30  0:31 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Linus Torvalds, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 08:14:42PM -0400, Jeff King wrote:

> I think this will be matching branch names, not fully qualified refs.
> Seems reasonable, but we should be sure to document that.

Also, I guess it would see "HEAD" when we're on a detached HEAD. That's
slightly ambiguous to match, in that you _could_ have refs/heads/HEAD,
but we try to make that hard to do. So it's probably not worth worrying
about.

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 22:50           ` Junio C Hamano
  2020-07-30  0:14             ` Jeff King
@ 2020-07-30  0:36             ` Junio C Hamano
  2020-07-30 18:02               ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
  2020-08-10 11:53               ` Avoiding 'master' nomenclature Johannes Schindelin
  1 sibling, 2 replies; 42+ messages in thread
From: Junio C Hamano @ 2020-07-30  0:36 UTC (permalink / raw)
  To: Jeff King; +Cc: Linus Torvalds, Johannes Schindelin, Git List Mailing

Junio C Hamano <gitster@pobox.com> writes:

> A rough outline I did while waiting for today's integration builds
> to finish looks like this, which does not look _too_ bad.

This time, with full test suite, documentation and a log message.

A few bugs in the code are also fixed since the preview version.

 - I was confused about wildmatch's return value.

 - wildmatch is now called with WM_PATHNAME.

 - Not just the "unvalued truth", but an empty string also works as
   a "clear the list of globs" now.

 - The final LF still needs to be added even when we suppress "into X".

-- >8 --
Subject: [PATCH] fmt-merge-msg: allow merge destination to be omitted again

In Git 2.28, we stopped special casing 'master' when producing the
default merge message by just removing the code to squelch "into
'master'" at the end of the message.

Introduce multi-valued merge.suppressDest configuration variable
that gives a set of globs to match against the name of the branch
into which the merge is being made, to let users specify for which
branch fmt-merge-msg's output should be shortened.  When it is not
set, 'master' is used as the sole value of the variable by default.

Because this reverts the behaviour to that of pre-2.28 in
repositories that have no relevant configuration, revert most of the
changes made to the tests back then.  At the end of t6200, add a few
tests to document the behaviour with the new configuration variable
and protect it from future regression.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/config/fmt-merge-msg.txt        | 12 ++++
 fmt-merge-msg.c                               | 24 ++++++-
 t/t1507-rev-parse-upstream.sh                 |  2 +-
 t/t4013-diff-various.sh                       |  4 +-
 t/t4013/diff.log_--decorate=full_--all        |  2 +-
 t/t4013/diff.log_--decorate_--all             |  2 +-
 ...--patch-with-stat_--summary_master_--_dir_ |  2 +-
 t/t4013/diff.log_--patch-with-stat_master     |  2 +-
 .../diff.log_--patch-with-stat_master_--_dir_ |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ..._--root_--patch-with-stat_--summary_master |  2 +-
 .../diff.log_--root_--patch-with-stat_master  |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4013/diff.log_--root_-p_master             |  2 +-
 t/t4013/diff.log_--root_master                |  2 +-
 t/t4013/diff.log_-m_-p_--first-parent_master  |  2 +-
 t/t4013/diff.log_-m_-p_master                 |  4 +-
 t/t4013/diff.log_-p_--first-parent_master     |  2 +-
 t/t4013/diff.log_-p_master                    |  2 +-
 t/t4013/diff.log_master                       |  2 +-
 t/t4013/diff.show_--first-parent_master       |  2 +-
 t/t4013/diff.show_-c_master                   |  2 +-
 t/t4013/diff.show_-m_master                   |  4 +-
 t/t4013/diff.show_master                      |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4202-log.sh                                | 72 +++++++++----------
 t/t6200-fmt-merge-msg.sh                      | 56 ++++++++++-----
 t/t7600-merge.sh                              | 14 ++--
 t/t7608-merge-messages.sh                     | 10 +--
 30 files changed, 148 insertions(+), 94 deletions(-)

diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
index c73cfa90b7..a8e8f74d0a 100644
--- a/Documentation/config/fmt-merge-msg.txt
+++ b/Documentation/config/fmt-merge-msg.txt
@@ -8,3 +8,15 @@ merge.log::
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
 	true is a synonym for 20.
+
+merge.suppressDest::
+	By adding a glob that matches the names of integration
+	branches to this multi-valued configuration variable, the
+	default merge message computed for merges into these
+	integration branches will omit " into <branch name>" from
+	its title.
++
+An element with an empty value can be used to clear the list
+of globs accumulated from previous configuration entries.
+When there is no `merge.suppressDest` variable defined, the
+default value of `master` is used for backward compatibility.
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index cfb8ff2f33..5fe879207b 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -10,6 +10,8 @@
 #include "commit-reach.h"
 
 static int use_branch_desc;
+static int suppress_dest_pattern_seen;
+static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
 
 int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 {
@@ -22,6 +24,12 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 			merge_log_config = DEFAULT_MERGE_LOG_LEN;
 	} else if (!strcmp(key, "merge.branchdesc")) {
 		use_branch_desc = git_config_bool(key, value);
+	} else if (!strcmp(key, "merge.suppressdest")) {
+		if (!value || !*value)
+			string_list_clear(&suppress_dest_patterns, 0);
+		else
+			string_list_append(&suppress_dest_patterns, value);
+		suppress_dest_pattern_seen = 1;
 	} else {
 		return git_default_config(key, value, cb);
 	}
@@ -408,6 +416,8 @@ static void fmt_merge_msg_title(struct strbuf *out,
 {
 	int i = 0;
 	char *sep = "";
+	struct string_list_item *item;
+	int suppress_merge_dest = 0;
 
 	strbuf_addstr(out, "Merge ");
 	for (i = 0; i < srcs.nr; i++) {
@@ -451,7 +461,16 @@ static void fmt_merge_msg_title(struct strbuf *out,
 			strbuf_addf(out, " of %s", srcs.items[i].string);
 	}
 
-	strbuf_addf(out, " into %s\n", current_branch);
+	for_each_string_list_item(item, &suppress_dest_patterns) {
+		if (!wildmatch(item->string, current_branch, WM_PATHNAME)) {
+			suppress_merge_dest = 1;
+			break;
+		}
+	}
+
+	if (!suppress_merge_dest)
+		strbuf_addf(out, " into %s", current_branch);
+	strbuf_addch(out, '\n');
 }
 
 static void fmt_tag_signature(struct strbuf *tagbuf,
@@ -596,6 +615,9 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 	void *current_branch_to_free;
 	struct merge_parents merge_parents;
 
+	if (!suppress_dest_pattern_seen)
+		string_list_append(&suppress_dest_patterns, "master");
+
 	memset(&merge_parents, 0, sizeof(merge_parents));
 
 	/* get current branch */
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index f213aa8053..dfc0d96d8a 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -137,7 +137,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
 	git branch -t new my-side@{u} &&
 	git merge -s ours new@{u} &&
 	git show -s --pretty=tformat:%s >actual &&
-	echo "Merge remote-tracking branch ${SQ}origin/side${SQ} into master" >expect &&
+	echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
 	test_cmp expect actual
 )
 '
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 43267d6024..3f60f7d96c 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -117,12 +117,12 @@ test_expect_success setup '
 
 : <<\EOF
 ! [initial] Initial
- * [master] Merge branch 'side' into master
+ * [master] Merge branch 'side'
   ! [rearrange] Rearranged lines in dir/sub
    ! [side] Side
 ----
   +  [rearrange] Rearranged lines in dir/sub
- -   [master] Merge branch 'side' into master
+ -   [master] Merge branch 'side'
  * + [side] Side
  *   [master^] Third
  *   [master~2] Second
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index c56783b985..3f9b872ece 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index 1cbdc038f4..f5e20e1e14 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
index f5b1b6516b..a18f1472a9 100644
--- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master
index af23803cdc..ae425c4672 100644
--- a/t/t4013/diff.log_--patch-with-stat_master
+++ b/t/t4013/diff.log_--patch-with-stat_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
index 814098fbf8..d5207cadf4 100644
--- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
index b927fe4a98..0fc1e8cd71 100644
--- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
index 6db3cea329..dffc09dde9 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master
index 98e9c320c3..55aa98012d 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
index b61b1117ae..019d85f7de 100644
--- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_master
index 345bd9e8a9..b42c334439 100644
--- a/t/t4013/diff.log_--root_-p_master
+++ b/t/t4013/diff.log_--root_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_master
index db56b1fe6b..e8f46159da 100644
--- a/t/t4013/diff.log_--root_master
+++ b/t/t4013/diff.log_--root_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_master
index bcadb50e26..7a0073f529 100644
--- a/t/t4013/diff.log_-m_-p_--first-parent_master
+++ b/t/t4013/diff.log_-m_-p_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_master
index 2acf43a9fb..9ca62a01ed 100644
--- a/t/t4013/diff.log_-m_-p_master
+++ b/t/t4013/diff.log_-m_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
@@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index 7289e35..992913c 100644
diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
index c6a5876d80..3fc896d424 100644
--- a/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_master
index 1841cded94..bf1326dc36 100644
--- a/t/t4013/diff.log_-p_master
+++ b/t/t4013/diff.log_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_master
index f8ec445eb3..a8f6ce5abd 100644
--- a/t/t4013/diff.log_master
+++ b/t/t4013/diff.log_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.show_--first-parent_master b/t/t4013/diff.show_--first-parent_master
index 94548f4598..3dcbe473a0 100644
--- a/t/t4013/diff.show_--first-parent_master
+++ b/t/t4013/diff.show_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
diff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_master
index 1c46ed64fd..81aba8da96 100644
--- a/t/t4013/diff.show_-c_master
+++ b/t/t4013/diff.show_-c_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --combined dir/sub
 index cead32e,7289e35..992913c
diff --git a/t/t4013/diff.show_-m_master b/t/t4013/diff.show_-m_master
index 7559fc22f8..4ea2ee453d 100644
--- a/t/t4013/diff.show_-m_master
+++ b/t/t4013/diff.show_-m_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
@@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index 7289e35..992913c 100644
diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master
index 57091c5d90..fb08ce0e46 100644
--- a/t/t4013/diff.show_master
+++ b/t/t4013/diff.show_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --cc dir/sub
 index cead32e,7289e35..992913c
diff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
index 5f13a71bb5..30aae7817b 100644
--- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
index 8acb88267b..d1d32bd34c 100644
--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index fd9af658af..a0930599aa 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -483,7 +483,7 @@ test_expect_success 'set up merge history' '
 '
 
 cat > expect <<\EOF
-*   Merge branch 'side' into master
+*   Merge branch 'side'
 |\
 | * side-2
 | * side-1
@@ -502,7 +502,7 @@ test_expect_success 'log --graph with merge' '
 '
 
 cat > expect <<\EOF
-| | | *   Merge branch 'side' into master
+| | | *   Merge branch 'side'
 | | | |\
 | | | | * side-2
 | | | | * side-1
@@ -521,7 +521,7 @@ test_expect_success 'log --graph --line-prefix="| | | " with merge' '
 '
 
 cat > expect.colors <<\EOF
-*   Merge branch 'side' into master
+*   Merge branch 'side'
 <BLUE>|<RESET><CYAN>\<RESET>
 <BLUE>|<RESET> * side-2
 <BLUE>|<RESET> * side-1
@@ -555,7 +555,7 @@ cat > expect <<\EOF
 |\  Merge: A B
 | | Author: A U Thor <author@example.com>
 | |
-| |     Merge branch 'side' into master
+| |     Merge branch 'side'
 | |
 | * commit tags/side-2
 | | Author: A U Thor <author@example.com>
@@ -632,11 +632,11 @@ test_expect_success 'set up more tangled history' '
 '
 
 cat > expect <<\EOF
-*   Merge tag 'reach' into master
+*   Merge tag 'reach'
 |\
 | \
 |  \
-*-. \   Merge tags 'octopus-a' and 'octopus-b' into master
+*-. \   Merge tags 'octopus-a' and 'octopus-b'
 |\ \ \
 * | | | seventh
 | | * | octopus-b
@@ -646,14 +646,14 @@ cat > expect <<\EOF
 |/ /
 | * reach
 |/
-*   Merge branch 'tangle' into master
+*   Merge branch 'tangle'
 |\
 | *   Merge branch 'side' (early part) into tangle
 | |\
 | * \   Merge branch 'master' (early part) into tangle
 | |\ \
 | * | | tangle-a
-* | | |   Merge branch 'side' into master
+* | | |   Merge branch 'side'
 |\ \ \ \
 | * | | | side-2
 | | |_|/
@@ -735,16 +735,16 @@ test_expect_success 'log.decorate configuration' '
 
 test_expect_success 'decorate-refs with glob' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
 	reach
 	EOF
 	cat >expect.no-decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -765,8 +765,8 @@ test_expect_success 'decorate-refs with glob' '
 
 test_expect_success 'decorate-refs without globs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -779,8 +779,8 @@ test_expect_success 'decorate-refs without globs' '
 
 test_expect_success 'multiple decorate-refs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
@@ -794,8 +794,8 @@ test_expect_success 'multiple decorate-refs' '
 
 test_expect_success 'decorate-refs-exclude with glob' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
 	octopus-a (tag: octopus-a)
@@ -811,8 +811,8 @@ test_expect_success 'decorate-refs-exclude with glob' '
 
 test_expect_success 'decorate-refs-exclude without globs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b, octopus-b)
 	octopus-a (tag: octopus-a, octopus-a)
@@ -828,8 +828,8 @@ test_expect_success 'decorate-refs-exclude without globs' '
 
 test_expect_success 'multiple decorate-refs-exclude' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
 	octopus-a (tag: octopus-a)
@@ -851,8 +851,8 @@ test_expect_success 'multiple decorate-refs-exclude' '
 
 test_expect_success 'decorate-refs and decorate-refs-exclude' '
 	cat >expect.no-decorate <<-\EOF &&
-	Merge-tag-reach-into-master (master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -866,8 +866,8 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' '
 
 test_expect_success 'deocrate-refs and log.excludeDecoration' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
@@ -881,10 +881,10 @@ test_expect_success 'deocrate-refs and log.excludeDecoration' '
 
 test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
+	Merge-tag-reach (HEAD -> master)
 	reach (tag: reach, reach)
 	seventh (tag: seventh)
-	Merge-branch-tangle-into-master
+	Merge-branch-tangle
 	Merge-branch-side-early-part-into-tangle (tangle)
 	tangle-a (tag: tangle-a)
 	EOF
@@ -1068,7 +1068,7 @@ cat >expect <<\EOF
 |\  Merge: MERGE_PARENTS
 | | Author: A U Thor <author@example.com>
 | |
-| |     Merge branch 'tangle' into master
+| |     Merge branch 'tangle'
 | |
 | *   commit COMMIT_OBJECT_NAME
 | |\  Merge: MERGE_PARENTS
@@ -1102,7 +1102,7 @@ cat >expect <<\EOF
 |\ \ \ \  Merge: MERGE_PARENTS
 | | | | | Author: A U Thor <author@example.com>
 | | | | |
-| | | | |     Merge branch 'side' into master
+| | | | |     Merge branch 'side'
 | | | | |
 | * | | | commit COMMIT_OBJECT_NAME
 | | |_|/  Author: A U Thor <author@example.com>
@@ -1343,7 +1343,7 @@ cat >expect <<\EOF
 *** |\  Merge: MERGE_PARENTS
 *** | | Author: A U Thor <author@example.com>
 *** | |
-*** | |     Merge branch 'tangle' into master
+*** | |     Merge branch 'tangle'
 *** | |
 *** | *   commit COMMIT_OBJECT_NAME
 *** | |\  Merge: MERGE_PARENTS
@@ -1377,7 +1377,7 @@ cat >expect <<\EOF
 *** |\ \ \ \  Merge: MERGE_PARENTS
 *** | | | | | Author: A U Thor <author@example.com>
 *** | | | | |
-*** | | | | |     Merge branch 'side' into master
+*** | | | | |     Merge branch 'side'
 *** | | | | |
 *** | * | | | commit COMMIT_OBJECT_NAME
 *** | | |_|/  Author: A U Thor <author@example.com>
@@ -1540,8 +1540,8 @@ cat >expect <<-\EOF
 * reach
 |
 | A	reach.t
-* Merge branch 'tangle' into master
-*   Merge branch 'side' into master
+* Merge branch 'tangle'
+*   Merge branch 'side'
 |\
 | * side-2
 |
@@ -1562,8 +1562,8 @@ cat >expect <<-\EOF
 * reach
 |
 | reach.t
-* Merge branch 'tangle' into master
-*   Merge branch 'side' into master
+* Merge branch 'tangle'
+*   Merge branch 'side'
 |\
 | * side-2
 |
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 2b3fd498d0..7d549748ef 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -79,7 +79,7 @@ test_expect_success GPG 'set up a signed tag' '
 '
 
 test_expect_success 'message for merging local branch' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 
 	git checkout master &&
 	git fetch . left &&
@@ -107,7 +107,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
 '
 
 test_expect_success 'message for merging external branch' '
-	echo "Merge branch ${apos}left${apos} of $(pwd) into master" >expected &&
+	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
 
 	git checkout master &&
 	git fetch "$(pwd)" left &&
@@ -118,7 +118,7 @@ test_expect_success 'message for merging external branch' '
 
 test_expect_success '[merge] summary/log configuration' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -160,7 +160,7 @@ test_expect_success 'setup FETCH_HEAD' '
 
 test_expect_success 'merge.log=3 limits shortlog length' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -177,7 +177,7 @@ test_expect_success 'merge.log=3 limits shortlog length' '
 
 test_expect_success 'merge.log=5 shows all 5 commits' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -195,7 +195,7 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
 
 test_expect_success '--log=5 with custom comment character' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	x By Another Author (3) and A U Thor (2)
 	x Via Another Committer
@@ -212,14 +212,14 @@ test_expect_success '--log=5 with custom comment character' '
 '
 
 test_expect_success 'merge.log=0 disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success '--log=3 limits shortlog length' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -236,7 +236,7 @@ test_expect_success '--log=3 limits shortlog length' '
 
 test_expect_success '--log=5 shows all 5 commits' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -253,13 +253,13 @@ test_expect_success '--log=5 shows all 5 commits' '
 '
 
 test_expect_success '--no-log disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success '--log=0 disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
@@ -300,7 +300,7 @@ test_expect_success 'fmt-merge-msg -m' '
 
 test_expect_success 'setup: expected shortlog for two branches' '
 	cat >expected <<-EOF
-	Merge branches ${apos}left${apos} and ${apos}right${apos} into master
+	Merge branches ${apos}left${apos} and ${apos}right${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -397,7 +397,7 @@ test_expect_success 'merge-msg with nothing to merge' '
 
 test_expect_success 'merge-msg tag' '
 	cat >expected <<-EOF &&
-	Merge tag ${apos}tag-r3${apos} into master
+	Merge tag ${apos}tag-r3${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -418,7 +418,7 @@ test_expect_success 'merge-msg tag' '
 
 test_expect_success 'merge-msg two tags' '
 	cat >expected <<-EOF &&
-	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos} into master
+	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -448,7 +448,7 @@ test_expect_success 'merge-msg two tags' '
 
 test_expect_success 'merge-msg tag and branch' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos} into master
+	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -479,7 +479,7 @@ test_expect_success 'merge-msg tag and branch' '
 test_expect_success 'merge-msg lots of commits' '
 	{
 		cat <<-EOF &&
-		Merge branch ${apos}long${apos} into master
+		Merge branch ${apos}long${apos}
 
 		* long: (35 commits)
 		EOF
@@ -516,7 +516,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	{
 		cat <<-\EOF
-		Merge tag '\''annote'\'' into master
+		Merge tag '\''annote'\''
 
 		An annotated one
 
@@ -531,7 +531,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	git merge --no-commit --no-ff $annote &&
 	{
 		cat <<-EOF
-		Merge tag '\''$annote'\'' into master
+		Merge tag '\''$annote'\''
 
 		An annotated one
 
@@ -542,4 +542,24 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	test_cmp expected .git/MERGE_MSG
 '
 
+test_expect_success 'merge.suppressDest configuration' '
+	git checkout -B side master &&
+	git commit --allow-empty -m "One step ahead" &&
+	git checkout master &&
+	git fetch . side &&
+
+	git -c merge.suppressDest="" fmt-merge-msg <.git/FETCH_HEAD >full.1 &&
+	head -n1 full.1 >actual &&
+	grep -e "Merge branch .side. into master" actual &&
+
+	git -c merge.suppressDest="mast" fmt-merge-msg <.git/FETCH_HEAD >full.2 &&
+	head -n1 full.2 >actual &&
+	grep -e "Merge branch .side. into master$" actual &&
+
+	git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
+	head -n1 full.3 >actual &&
+	grep -e "Merge branch .side." actual &&
+	! grep -e " into master$" actual
+'
+
 test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1d45f9a4ed..5883a6adc3 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -14,9 +14,9 @@ Testing basic merge operations/option parsing.
     ! [c4] c4
      ! [c5] c5
       ! [c6] c6
-       * [master] Merge commit 'c1' into master
+       * [master] Merge commit 'c1'
 --------
-       - [master] Merge commit 'c1' into master
+       - [master] Merge commit 'c1'
  +     * [c1] commit 1
       +  [c6] c6
      +   [c5] c5
@@ -44,8 +44,8 @@ test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9
 test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z
 
 create_merge_msgs () {
-	echo "Merge tag 'c2' into master" >msg.1-5 &&
-	echo "Merge tags 'c2' and 'c3' into master" >msg.1-5-9 &&
+	echo "Merge tag 'c2'" >msg.1-5 &&
+	echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 &&
 	{
 		echo "Squashed commit of the following:" &&
 		echo &&
@@ -258,7 +258,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
 	git commit --no-edit -a &&
 
 	cat >expect <<-\EOF &&
-	Merge tag '"'"'c7'"'"' into master
+	Merge tag '"'"'c7'"'"'
 
 	# ------------------------ >8 ------------------------
 	# Do not modify or remove the line above.
@@ -808,10 +808,10 @@ test_expect_success 'merge with conflicted --autostash changes' '
 '
 
 cat >expected.branch <<\EOF
-Merge branch 'c5-branch' (early part) into master
+Merge branch 'c5-branch' (early part)
 EOF
 cat >expected.tag <<\EOF
-Merge commit 'c5~1' into master
+Merge commit 'c5~1'
 EOF
 
 test_expect_success 'merge early part of c2' '
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 2af33f195b..8e7e0a5865 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -16,7 +16,7 @@ test_expect_success 'merge local branch' '
 	git checkout master &&
 	test_commit master-2 &&
 	git merge local-branch &&
-	check_oneline "Merge branch Qlocal-branchQ into master"
+	check_oneline "Merge branch Qlocal-branchQ"
 '
 
 test_expect_success 'merge octopus branches' '
@@ -26,7 +26,7 @@ test_expect_success 'merge octopus branches' '
 	test_commit octopus-2 &&
 	git checkout master &&
 	git merge octopus-a octopus-b &&
-	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ into master"
+	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
 '
 
 test_expect_success 'merge tag' '
@@ -35,7 +35,7 @@ test_expect_success 'merge tag' '
 	git checkout master &&
 	test_commit master-3 &&
 	git merge tag-1 &&
-	check_oneline "Merge tag Qtag-1Q into master"
+	check_oneline "Merge tag Qtag-1Q"
 '
 
 test_expect_success 'ambiguous tag' '
@@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' '
 	git checkout master &&
 	test_commit master-4 &&
 	git merge ambiguous &&
-	check_oneline "Merge tag QambiguousQ into master"
+	check_oneline "Merge tag QambiguousQ"
 '
 
 test_expect_success 'remote-tracking branch' '
@@ -54,7 +54,7 @@ test_expect_success 'remote-tracking branch' '
 	git checkout master &&
 	test_commit master-5 &&
 	git merge origin/master &&
-	check_oneline "Merge remote-tracking branch Qorigin/masterQ into master"
+	check_oneline "Merge remote-tracking branch Qorigin/masterQ"
 '
 
 test_done
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:29           ` Jeff King
@ 2020-07-30  0:44             ` Linus Torvalds
  2020-07-30  0:52               ` Jeff King
  0 siblings, 1 reply; 42+ messages in thread
From: Linus Torvalds @ 2020-07-30  0:44 UTC (permalink / raw)
  To: Jeff King; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 5:29 PM Jeff King <peff@peff.net> wrote:
>
> This is an interesting middle ground. I'm a little iffy on it just
> because it complicates the very simple case of "should I mention the
> destination branch",

No, you're absolutely right. After sending that message I went and
looked at how nasty it would be, and it's not worth it.

If we were doing perl or shell or whatever (like the original scripts
were), it would have been trivial. But as things are now, I'll retract
that idea as being overly complicated.

It would solve my "rewrite repo name" thing, but I've solved that with
a hook, and it's a bit hacky, but it's not horrendous or wrong. As you
say, hooks are for special cases, and that hostname rewriting I do is
very much a special case.

             Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:44             ` Linus Torvalds
@ 2020-07-30  0:52               ` Jeff King
  2020-07-30  0:57                 ` Linus Torvalds
  0 siblings, 1 reply; 42+ messages in thread
From: Jeff King @ 2020-07-30  0:52 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 05:44:00PM -0700, Linus Torvalds wrote:

> On Wed, Jul 29, 2020 at 5:29 PM Jeff King <peff@peff.net> wrote:
> >
> > This is an interesting middle ground. I'm a little iffy on it just
> > because it complicates the very simple case of "should I mention the
> > destination branch",
> 
> No, you're absolutely right. After sending that message I went and
> looked at how nasty it would be, and it's not worth it.
> 
> If we were doing perl or shell or whatever (like the original scripts
> were), it would have been trivial. But as things are now, I'll retract
> that idea as being overly complicated.

Heh. For what it's worth, I wrote a paragraph that started with "if we
were doing this in perl..." in my response but deleted it. So I think we
are very much on the same page. :)

> It would solve my "rewrite repo name" thing, but I've solved that with
> a hook, and it's a bit hacky, but it's not horrendous or wrong. As you
> say, hooks are for special cases, and that hostname rewriting I do is
> very much a special case.

There might be room for an easy feature there, too. If we're given url A
on the command line and then we convert it to B with insteadOf, it's not
clear to me which one is the thing we should write into the merge
message. (I'd think "A", but it sounds from your example that we write
"B"). So possibly reversing that behavior, or adding an option to do so,
would help. Or providing an equivalent of insteadOf that applies to
writing URLs publicly.

And while it's definitely a special case, I suspect it may be one that
other folks have, too (e.g., mentioning https:// URLs is probably more
friendly than ssh for most people).

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:52               ` Jeff King
@ 2020-07-30  0:57                 ` Linus Torvalds
  2020-07-31  0:44                   ` Jeff King
  0 siblings, 1 reply; 42+ messages in thread
From: Linus Torvalds @ 2020-07-30  0:57 UTC (permalink / raw)
  To: Jeff King; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 5:52 PM Jeff King <peff@peff.net> wrote:
>
> There might be room for an easy feature there, too. If we're given url A
> on the command line and then we convert it to B with insteadOf, it's not
> clear to me which one is the thing we should write into the merge
> message.

You're right, and I actually considered doing that originally.

The reason I ended up with my hook is that a number of people send me
their pull requests using the ssh address anyway, because they as
maintainers end up having kernel.org accounts, and that's how they
interact with it.

So I actually end up wanting to rewrite it to use the public address
even if the insteadOf logic didn't trigger, because those ssh
addresses just don't make sense in the public history, and there's an
easy 1:1 translation to the public mirrors.

> And while it's definitely a special case, I suspect it may be one that
> other folks have, too (e.g., mentioning https:// URLs is probably more
> friendly than ssh for most people).

Now there I agree - I suspect a lot of developers inside various
companies have "this is the internal mirror I use, because
firewalls/bandwidth/whatever", but they might not necessarily want
that internal choice be reflected in their log messages.

That said, I'm just _imagining_ that to be true. I might be reading
too much into my own habits.

            Linus

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-29 20:38     ` Jonathan Nieder
  2020-07-29 20:46       ` Linus Torvalds
@ 2020-07-30  8:17       ` lego_12239
  2020-07-31  0:57         ` Jeff King
  1 sibling, 1 reply; 42+ messages in thread
From: lego_12239 @ 2020-07-30  8:17 UTC (permalink / raw)
  To: Git List Mailing

On Wed, Jul 29, 2020 at 01:38:56PM -0700, Jonathan Nieder wrote:
> The commit message describes its intent
> 
>   commit 489947cee5095b168cbac111ff7bd1eadbbd90dd
>   Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>   Date:   Tue Jun 23 22:33:23 2020 +0000
> 
>       fmt-merge-msg: stop treating `master` specially
> 
>       In the context of many projects renaming their primary branch names away
>       from `master`, Git wants to stop treating the `master` branch specially.

Wow. Jonathan, you are a good student of Goebbels! "many projects" :-D.
You lie. These are few but very noisy projects. Don't kid youself.

-- 
Олег Неманов (Oleg Nemanov)

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:23               ` Linus Torvalds
@ 2020-07-30 10:11                 ` Michal Suchánek
  0 siblings, 0 replies; 42+ messages in thread
From: Michal Suchánek @ 2020-07-30 10:11 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Jeff King, Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 05:23:59PM -0700, Linus Torvalds wrote:
> On Wed, Jul 29, 2020 at 5:14 PM Jeff King <peff@peff.net> wrote:
> >
> > I'm on the fence on how magical to make the default. Having "master"
> > there gets Linus's case back where he wanted without having to configure
> > anything, which is probably reasonable. I'm not sure if people would
> > want their init.defaultBranch in addition / instead.
> 
> Junio seemed to go for "instead", but I think it might be more natural
> to just have "master" as the initial entry, and anybody adding entries
> will add it to the list.
> 
> I do think it might be a good idea to make "git init" just add the
> entry from whatever the default initial branch is.
> 
> And then the "empty entry to clear" can be used to _force_ a clean
> slate, although I don't see why anybody would ever really want that.
> If you make your default branch name be "develop", and you really want
> to see the "into develop", you'd remove the entry that "git init"
> would hypothetically add, you wouldn't necessarily want to do a "clear
> list".

Please don't. I have seen this in systemd services and it is a mess  to
deal with from user side. I suppose it is a mess on the implementation
side as well. This mystery variable content is just pain and the
complexity of the problem at hand does not really call for such
mostrosity.

FTR I don't really care about the omission of target branch in merge
messages. I typically work with repositories that are about three levels
of indirection away from the 'master' branch that would get omitted by
deafult. But in the systemd case you do need to care to expunge the
previous broken values and it is a real pain.

Thanks

Michal

^ permalink raw reply	[flat|nested] 42+ messages in thread

* [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-30  0:36             ` Junio C Hamano
@ 2020-07-30 18:02               ` Junio C Hamano
  2020-07-30 18:02                 ` [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" Junio C Hamano
                                   ` (2 more replies)
  2020-08-10 11:53               ` Avoiding 'master' nomenclature Johannes Schindelin
  1 sibling, 3 replies; 42+ messages in thread
From: Junio C Hamano @ 2020-07-30 18:02 UTC (permalink / raw)
  To: git

So, this is the third iteration, which separates the reversion that
involves too many uninteresting test changes, and the implementation
of the new feature proper.

Two things that changed in the implementation since the previous
iterations are

 - An assignment-less 'truth', i.e.

	[merge] suppressDest

   is now an error ("missing value for 'merge.suppressDest'"), not
   "clear the list", which should be spelled as an empty string, i.e.

        [merge] suppressDest = ""

 - Scanning of dest_patterns to see if "into <branch>" is suppressed
   for the current_branch is done in a helper function to make the
   main codeflow easier to read, as suggested by Peff.

The previous iterations were

 v1 <xmqqlfj27x7q.fsf@gitster.c.googlers.com>
 v2 <xmqq5za596uo.fsf@gitster.c.googlers.com>

and can be found at https://lore.kernel.org/git/

Junio C Hamano (2):
  Revert "fmt-merge-msg: stop treating `master` specially"
  fmt-merge-msg: allow merge destination to be omitted again

 Documentation/config/fmt-merge-msg.txt        | 12 ++++
 fmt-merge-msg.c                               | 35 ++++++++-
 t/t1507-rev-parse-upstream.sh                 |  2 +-
 t/t4013-diff-various.sh                       |  4 +-
 t/t4013/diff.log_--decorate=full_--all        |  2 +-
 t/t4013/diff.log_--decorate_--all             |  2 +-
 ...--patch-with-stat_--summary_master_--_dir_ |  2 +-
 t/t4013/diff.log_--patch-with-stat_master     |  2 +-
 .../diff.log_--patch-with-stat_master_--_dir_ |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ..._--root_--patch-with-stat_--summary_master |  2 +-
 .../diff.log_--root_--patch-with-stat_master  |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4013/diff.log_--root_-p_master             |  2 +-
 t/t4013/diff.log_--root_master                |  2 +-
 t/t4013/diff.log_-m_-p_--first-parent_master  |  2 +-
 t/t4013/diff.log_-m_-p_master                 |  4 +-
 t/t4013/diff.log_-p_--first-parent_master     |  2 +-
 t/t4013/diff.log_-p_master                    |  2 +-
 t/t4013/diff.log_master                       |  2 +-
 t/t4013/diff.show_--first-parent_master       |  2 +-
 t/t4013/diff.show_-c_master                   |  2 +-
 t/t4013/diff.show_-m_master                   |  4 +-
 t/t4013/diff.show_master                      |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4202-log.sh                                | 72 +++++++++----------
 t/t6200-fmt-merge-msg.sh                      | 56 ++++++++++-----
 t/t7600-merge.sh                              | 14 ++--
 t/t7608-merge-messages.sh                     | 10 +--
 30 files changed, 159 insertions(+), 94 deletions(-)

-- 
2.28.0


^ permalink raw reply	[flat|nested] 42+ messages in thread

* [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially"
  2020-07-30 18:02               ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
@ 2020-07-30 18:02                 ` Junio C Hamano
  2020-07-30 19:10                   ` Eric Sunshine
  2020-07-30 18:02                 ` [PATCH v3 2/2] fmt-merge-msg: allow merge destination to be omitted again Junio C Hamano
  2020-07-31  0:42                 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Jeff King
  2 siblings, 1 reply; 42+ messages in thread
From: Junio C Hamano @ 2020-07-30 18:02 UTC (permalink / raw)
  To: git

This reverts commit 489947cee5095b168cbac111ff7bd1eadbbd90dd, which
stopped treating merges into the 'master' branch any specially when
preparing the default merge message.  As the goal was not to have
any single branch designated as special, it solved it by leaving the
"into <branchname>" at the end of the title of the default merge
message for any and all branches.  An obvious and easy alternative
to treat everybody equally could have been to remove it for every
branch, but that involves loss of information.

We'll introduce a new mechanism to let end-users specify merges into
which branches would omit the "into <branchname>" from the title of
the default merge message, and make the mechanism, when unconfigured,
treat the traditional 'master' special again, so all the changes to
the tests we made earlier will become unnecessary, as these tests
will be run with out configuring the said new mechanism.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 fmt-merge-msg.c                               |  5 +-
 t/t1507-rev-parse-upstream.sh                 |  2 +-
 t/t4013-diff-various.sh                       |  4 +-
 t/t4013/diff.log_--decorate=full_--all        |  2 +-
 t/t4013/diff.log_--decorate_--all             |  2 +-
 ...--patch-with-stat_--summary_master_--_dir_ |  2 +-
 t/t4013/diff.log_--patch-with-stat_master     |  2 +-
 .../diff.log_--patch-with-stat_master_--_dir_ |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ..._--root_--patch-with-stat_--summary_master |  2 +-
 .../diff.log_--root_--patch-with-stat_master  |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4013/diff.log_--root_-p_master             |  2 +-
 t/t4013/diff.log_--root_master                |  2 +-
 t/t4013/diff.log_-m_-p_--first-parent_master  |  2 +-
 t/t4013/diff.log_-m_-p_master                 |  4 +-
 t/t4013/diff.log_-p_--first-parent_master     |  2 +-
 t/t4013/diff.log_-p_master                    |  2 +-
 t/t4013/diff.log_master                       |  2 +-
 t/t4013/diff.show_--first-parent_master       |  2 +-
 t/t4013/diff.show_-c_master                   |  2 +-
 t/t4013/diff.show_-m_master                   |  4 +-
 t/t4013/diff.show_master                      |  2 +-
 ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
 ...root_-c_--patch-with-stat_--summary_master |  2 +-
 t/t4202-log.sh                                | 72 +++++++++----------
 t/t6200-fmt-merge-msg.sh                      | 36 +++++-----
 t/t7600-merge.sh                              | 14 ++--
 t/t7608-merge-messages.sh                     | 10 +--
 29 files changed, 97 insertions(+), 94 deletions(-)

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index cfb8ff2f33..72d32bd73b 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -451,7 +451,10 @@ static void fmt_merge_msg_title(struct strbuf *out,
 			strbuf_addf(out, " of %s", srcs.items[i].string);
 	}
 
-	strbuf_addf(out, " into %s\n", current_branch);
+	if (!strcmp("master", current_branch))
+		strbuf_addch(out, '\n');
+	else
+		strbuf_addf(out, " into %s\n", current_branch);
 }
 
 static void fmt_tag_signature(struct strbuf *tagbuf,
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index f213aa8053..dfc0d96d8a 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -137,7 +137,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
 	git branch -t new my-side@{u} &&
 	git merge -s ours new@{u} &&
 	git show -s --pretty=tformat:%s >actual &&
-	echo "Merge remote-tracking branch ${SQ}origin/side${SQ} into master" >expect &&
+	echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
 	test_cmp expect actual
 )
 '
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 43267d6024..3f60f7d96c 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -117,12 +117,12 @@ test_expect_success setup '
 
 : <<\EOF
 ! [initial] Initial
- * [master] Merge branch 'side' into master
+ * [master] Merge branch 'side'
   ! [rearrange] Rearranged lines in dir/sub
    ! [side] Side
 ----
   +  [rearrange] Rearranged lines in dir/sub
- -   [master] Merge branch 'side' into master
+ -   [master] Merge branch 'side'
  * + [side] Side
  *   [master^] Third
  *   [master~2] Second
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index c56783b985..3f9b872ece 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index 1cbdc038f4..f5e20e1e14 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
index f5b1b6516b..a18f1472a9 100644
--- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master
index af23803cdc..ae425c4672 100644
--- a/t/t4013/diff.log_--patch-with-stat_master
+++ b/t/t4013/diff.log_--patch-with-stat_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
index 814098fbf8..d5207cadf4 100644
--- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
index b927fe4a98..0fc1e8cd71 100644
--- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
index 6db3cea329..dffc09dde9 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master
index 98e9c320c3..55aa98012d 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
index b61b1117ae..019d85f7de 100644
--- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_master
index 345bd9e8a9..b42c334439 100644
--- a/t/t4013/diff.log_--root_-p_master
+++ b/t/t4013/diff.log_--root_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_master
index db56b1fe6b..e8f46159da 100644
--- a/t/t4013/diff.log_--root_master
+++ b/t/t4013/diff.log_--root_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_master
index bcadb50e26..7a0073f529 100644
--- a/t/t4013/diff.log_-m_-p_--first-parent_master
+++ b/t/t4013/diff.log_-m_-p_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_master
index 2acf43a9fb..9ca62a01ed 100644
--- a/t/t4013/diff.log_-m_-p_master
+++ b/t/t4013/diff.log_-m_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
@@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index 7289e35..992913c 100644
diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
index c6a5876d80..3fc896d424 100644
--- a/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_master
index 1841cded94..bf1326dc36 100644
--- a/t/t4013/diff.log_-p_master
+++ b/t/t4013/diff.log_-p_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_master
index f8ec445eb3..a8f6ce5abd 100644
--- a/t/t4013/diff.log_master
+++ b/t/t4013/diff.log_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.show_--first-parent_master b/t/t4013/diff.show_--first-parent_master
index 94548f4598..3dcbe473a0 100644
--- a/t/t4013/diff.show_--first-parent_master
+++ b/t/t4013/diff.show_--first-parent_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
diff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_master
index 1c46ed64fd..81aba8da96 100644
--- a/t/t4013/diff.show_-c_master
+++ b/t/t4013/diff.show_-c_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --combined dir/sub
 index cead32e,7289e35..992913c
diff --git a/t/t4013/diff.show_-m_master b/t/t4013/diff.show_-m_master
index 7559fc22f8..4ea2ee453d 100644
--- a/t/t4013/diff.show_-m_master
+++ b/t/t4013/diff.show_-m_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
@@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index 7289e35..992913c 100644
diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master
index 57091c5d90..fb08ce0e46 100644
--- a/t/t4013/diff.show_master
+++ b/t/t4013/diff.show_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
 diff --cc dir/sub
 index cead32e,7289e35..992913c
diff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
index 5f13a71bb5..30aae7817b 100644
--- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
index 8acb88267b..d1d32bd34c 100644
--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side' into master
+    Merge branch 'side'
 
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index fd9af658af..a0930599aa 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -483,7 +483,7 @@ test_expect_success 'set up merge history' '
 '
 
 cat > expect <<\EOF
-*   Merge branch 'side' into master
+*   Merge branch 'side'
 |\
 | * side-2
 | * side-1
@@ -502,7 +502,7 @@ test_expect_success 'log --graph with merge' '
 '
 
 cat > expect <<\EOF
-| | | *   Merge branch 'side' into master
+| | | *   Merge branch 'side'
 | | | |\
 | | | | * side-2
 | | | | * side-1
@@ -521,7 +521,7 @@ test_expect_success 'log --graph --line-prefix="| | | " with merge' '
 '
 
 cat > expect.colors <<\EOF
-*   Merge branch 'side' into master
+*   Merge branch 'side'
 <BLUE>|<RESET><CYAN>\<RESET>
 <BLUE>|<RESET> * side-2
 <BLUE>|<RESET> * side-1
@@ -555,7 +555,7 @@ cat > expect <<\EOF
 |\  Merge: A B
 | | Author: A U Thor <author@example.com>
 | |
-| |     Merge branch 'side' into master
+| |     Merge branch 'side'
 | |
 | * commit tags/side-2
 | | Author: A U Thor <author@example.com>
@@ -632,11 +632,11 @@ test_expect_success 'set up more tangled history' '
 '
 
 cat > expect <<\EOF
-*   Merge tag 'reach' into master
+*   Merge tag 'reach'
 |\
 | \
 |  \
-*-. \   Merge tags 'octopus-a' and 'octopus-b' into master
+*-. \   Merge tags 'octopus-a' and 'octopus-b'
 |\ \ \
 * | | | seventh
 | | * | octopus-b
@@ -646,14 +646,14 @@ cat > expect <<\EOF
 |/ /
 | * reach
 |/
-*   Merge branch 'tangle' into master
+*   Merge branch 'tangle'
 |\
 | *   Merge branch 'side' (early part) into tangle
 | |\
 | * \   Merge branch 'master' (early part) into tangle
 | |\ \
 | * | | tangle-a
-* | | |   Merge branch 'side' into master
+* | | |   Merge branch 'side'
 |\ \ \ \
 | * | | | side-2
 | | |_|/
@@ -735,16 +735,16 @@ test_expect_success 'log.decorate configuration' '
 
 test_expect_success 'decorate-refs with glob' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
 	reach
 	EOF
 	cat >expect.no-decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -765,8 +765,8 @@ test_expect_success 'decorate-refs with glob' '
 
 test_expect_success 'decorate-refs without globs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -779,8 +779,8 @@ test_expect_success 'decorate-refs without globs' '
 
 test_expect_success 'multiple decorate-refs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
@@ -794,8 +794,8 @@ test_expect_success 'multiple decorate-refs' '
 
 test_expect_success 'decorate-refs-exclude with glob' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
 	octopus-a (tag: octopus-a)
@@ -811,8 +811,8 @@ test_expect_success 'decorate-refs-exclude with glob' '
 
 test_expect_success 'decorate-refs-exclude without globs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b, octopus-b)
 	octopus-a (tag: octopus-a, octopus-a)
@@ -828,8 +828,8 @@ test_expect_success 'decorate-refs-exclude without globs' '
 
 test_expect_success 'multiple decorate-refs-exclude' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (HEAD -> master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
 	octopus-a (tag: octopus-a)
@@ -851,8 +851,8 @@ test_expect_success 'multiple decorate-refs-exclude' '
 
 test_expect_success 'decorate-refs and decorate-refs-exclude' '
 	cat >expect.no-decorate <<-\EOF &&
-	Merge-tag-reach-into-master (master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
 	octopus-a
@@ -866,8 +866,8 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' '
 
 test_expect_success 'deocrate-refs and log.excludeDecoration' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (master)
-	Merge-tags-octopus-a-and-octopus-b-into-master
+	Merge-tag-reach (master)
+	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b (octopus-b)
 	octopus-a (octopus-a)
@@ -881,10 +881,10 @@ test_expect_success 'deocrate-refs and log.excludeDecoration' '
 
 test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach-into-master (HEAD -> master)
+	Merge-tag-reach (HEAD -> master)
 	reach (tag: reach, reach)
 	seventh (tag: seventh)
-	Merge-branch-tangle-into-master
+	Merge-branch-tangle
 	Merge-branch-side-early-part-into-tangle (tangle)
 	tangle-a (tag: tangle-a)
 	EOF
@@ -1068,7 +1068,7 @@ cat >expect <<\EOF
 |\  Merge: MERGE_PARENTS
 | | Author: A U Thor <author@example.com>
 | |
-| |     Merge branch 'tangle' into master
+| |     Merge branch 'tangle'
 | |
 | *   commit COMMIT_OBJECT_NAME
 | |\  Merge: MERGE_PARENTS
@@ -1102,7 +1102,7 @@ cat >expect <<\EOF
 |\ \ \ \  Merge: MERGE_PARENTS
 | | | | | Author: A U Thor <author@example.com>
 | | | | |
-| | | | |     Merge branch 'side' into master
+| | | | |     Merge branch 'side'
 | | | | |
 | * | | | commit COMMIT_OBJECT_NAME
 | | |_|/  Author: A U Thor <author@example.com>
@@ -1343,7 +1343,7 @@ cat >expect <<\EOF
 *** |\  Merge: MERGE_PARENTS
 *** | | Author: A U Thor <author@example.com>
 *** | |
-*** | |     Merge branch 'tangle' into master
+*** | |     Merge branch 'tangle'
 *** | |
 *** | *   commit COMMIT_OBJECT_NAME
 *** | |\  Merge: MERGE_PARENTS
@@ -1377,7 +1377,7 @@ cat >expect <<\EOF
 *** |\ \ \ \  Merge: MERGE_PARENTS
 *** | | | | | Author: A U Thor <author@example.com>
 *** | | | | |
-*** | | | | |     Merge branch 'side' into master
+*** | | | | |     Merge branch 'side'
 *** | | | | |
 *** | * | | | commit COMMIT_OBJECT_NAME
 *** | | |_|/  Author: A U Thor <author@example.com>
@@ -1540,8 +1540,8 @@ cat >expect <<-\EOF
 * reach
 |
 | A	reach.t
-* Merge branch 'tangle' into master
-*   Merge branch 'side' into master
+* Merge branch 'tangle'
+*   Merge branch 'side'
 |\
 | * side-2
 |
@@ -1562,8 +1562,8 @@ cat >expect <<-\EOF
 * reach
 |
 | reach.t
-* Merge branch 'tangle' into master
-*   Merge branch 'side' into master
+* Merge branch 'tangle'
+*   Merge branch 'side'
 |\
 | * side-2
 |
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 2b3fd498d0..e4c2a6eca4 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -79,7 +79,7 @@ test_expect_success GPG 'set up a signed tag' '
 '
 
 test_expect_success 'message for merging local branch' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 
 	git checkout master &&
 	git fetch . left &&
@@ -107,7 +107,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
 '
 
 test_expect_success 'message for merging external branch' '
-	echo "Merge branch ${apos}left${apos} of $(pwd) into master" >expected &&
+	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
 
 	git checkout master &&
 	git fetch "$(pwd)" left &&
@@ -118,7 +118,7 @@ test_expect_success 'message for merging external branch' '
 
 test_expect_success '[merge] summary/log configuration' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -160,7 +160,7 @@ test_expect_success 'setup FETCH_HEAD' '
 
 test_expect_success 'merge.log=3 limits shortlog length' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -177,7 +177,7 @@ test_expect_success 'merge.log=3 limits shortlog length' '
 
 test_expect_success 'merge.log=5 shows all 5 commits' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -195,7 +195,7 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
 
 test_expect_success '--log=5 with custom comment character' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	x By Another Author (3) and A U Thor (2)
 	x Via Another Committer
@@ -212,14 +212,14 @@ test_expect_success '--log=5 with custom comment character' '
 '
 
 test_expect_success 'merge.log=0 disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success '--log=3 limits shortlog length' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -236,7 +236,7 @@ test_expect_success '--log=3 limits shortlog length' '
 
 test_expect_success '--log=5 shows all 5 commits' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos} into master
+	Merge branch ${apos}left${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -253,13 +253,13 @@ test_expect_success '--log=5 shows all 5 commits' '
 '
 
 test_expect_success '--no-log disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success '--log=0 disables shortlog' '
-	echo "Merge branch ${apos}left${apos} into master" >expected &&
+	echo "Merge branch ${apos}left${apos}" >expected &&
 	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
@@ -300,7 +300,7 @@ test_expect_success 'fmt-merge-msg -m' '
 
 test_expect_success 'setup: expected shortlog for two branches' '
 	cat >expected <<-EOF
-	Merge branches ${apos}left${apos} and ${apos}right${apos} into master
+	Merge branches ${apos}left${apos} and ${apos}right${apos}
 
 	# By Another Author (3) and A U Thor (2)
 	# Via Another Committer
@@ -397,7 +397,7 @@ test_expect_success 'merge-msg with nothing to merge' '
 
 test_expect_success 'merge-msg tag' '
 	cat >expected <<-EOF &&
-	Merge tag ${apos}tag-r3${apos} into master
+	Merge tag ${apos}tag-r3${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -418,7 +418,7 @@ test_expect_success 'merge-msg tag' '
 
 test_expect_success 'merge-msg two tags' '
 	cat >expected <<-EOF &&
-	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos} into master
+	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -448,7 +448,7 @@ test_expect_success 'merge-msg two tags' '
 
 test_expect_success 'merge-msg tag and branch' '
 	cat >expected <<-EOF &&
-	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos} into master
+	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
 
 	* tag ${apos}tag-r3${apos}:
 	  Right #3
@@ -479,7 +479,7 @@ test_expect_success 'merge-msg tag and branch' '
 test_expect_success 'merge-msg lots of commits' '
 	{
 		cat <<-EOF &&
-		Merge branch ${apos}long${apos} into master
+		Merge branch ${apos}long${apos}
 
 		* long: (35 commits)
 		EOF
@@ -516,7 +516,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	{
 		cat <<-\EOF
-		Merge tag '\''annote'\'' into master
+		Merge tag '\''annote'\''
 
 		An annotated one
 
@@ -531,7 +531,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	git merge --no-commit --no-ff $annote &&
 	{
 		cat <<-EOF
-		Merge tag '\''$annote'\'' into master
+		Merge tag '\''$annote'\''
 
 		An annotated one
 
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1d45f9a4ed..5883a6adc3 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -14,9 +14,9 @@ Testing basic merge operations/option parsing.
     ! [c4] c4
      ! [c5] c5
       ! [c6] c6
-       * [master] Merge commit 'c1' into master
+       * [master] Merge commit 'c1'
 --------
-       - [master] Merge commit 'c1' into master
+       - [master] Merge commit 'c1'
  +     * [c1] commit 1
       +  [c6] c6
      +   [c5] c5
@@ -44,8 +44,8 @@ test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9
 test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z
 
 create_merge_msgs () {
-	echo "Merge tag 'c2' into master" >msg.1-5 &&
-	echo "Merge tags 'c2' and 'c3' into master" >msg.1-5-9 &&
+	echo "Merge tag 'c2'" >msg.1-5 &&
+	echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 &&
 	{
 		echo "Squashed commit of the following:" &&
 		echo &&
@@ -258,7 +258,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
 	git commit --no-edit -a &&
 
 	cat >expect <<-\EOF &&
-	Merge tag '"'"'c7'"'"' into master
+	Merge tag '"'"'c7'"'"'
 
 	# ------------------------ >8 ------------------------
 	# Do not modify or remove the line above.
@@ -808,10 +808,10 @@ test_expect_success 'merge with conflicted --autostash changes' '
 '
 
 cat >expected.branch <<\EOF
-Merge branch 'c5-branch' (early part) into master
+Merge branch 'c5-branch' (early part)
 EOF
 cat >expected.tag <<\EOF
-Merge commit 'c5~1' into master
+Merge commit 'c5~1'
 EOF
 
 test_expect_success 'merge early part of c2' '
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 2af33f195b..8e7e0a5865 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -16,7 +16,7 @@ test_expect_success 'merge local branch' '
 	git checkout master &&
 	test_commit master-2 &&
 	git merge local-branch &&
-	check_oneline "Merge branch Qlocal-branchQ into master"
+	check_oneline "Merge branch Qlocal-branchQ"
 '
 
 test_expect_success 'merge octopus branches' '
@@ -26,7 +26,7 @@ test_expect_success 'merge octopus branches' '
 	test_commit octopus-2 &&
 	git checkout master &&
 	git merge octopus-a octopus-b &&
-	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ into master"
+	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
 '
 
 test_expect_success 'merge tag' '
@@ -35,7 +35,7 @@ test_expect_success 'merge tag' '
 	git checkout master &&
 	test_commit master-3 &&
 	git merge tag-1 &&
-	check_oneline "Merge tag Qtag-1Q into master"
+	check_oneline "Merge tag Qtag-1Q"
 '
 
 test_expect_success 'ambiguous tag' '
@@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' '
 	git checkout master &&
 	test_commit master-4 &&
 	git merge ambiguous &&
-	check_oneline "Merge tag QambiguousQ into master"
+	check_oneline "Merge tag QambiguousQ"
 '
 
 test_expect_success 'remote-tracking branch' '
@@ -54,7 +54,7 @@ test_expect_success 'remote-tracking branch' '
 	git checkout master &&
 	test_commit master-5 &&
 	git merge origin/master &&
-	check_oneline "Merge remote-tracking branch Qorigin/masterQ into master"
+	check_oneline "Merge remote-tracking branch Qorigin/masterQ"
 '
 
 test_done
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 42+ messages in thread

* [PATCH v3 2/2] fmt-merge-msg: allow merge destination to be omitted again
  2020-07-30 18:02               ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
  2020-07-30 18:02                 ` [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" Junio C Hamano
@ 2020-07-30 18:02                 ` Junio C Hamano
  2020-07-31  0:42                 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Jeff King
  2 siblings, 0 replies; 42+ messages in thread
From: Junio C Hamano @ 2020-07-30 18:02 UTC (permalink / raw)
  To: git

In Git 2.28, we stopped special casing 'master' when producing the
default merge message by just removing the code to squelch "into
'master'" at the end of the message.

Introduce multi-valued merge.suppressDest configuration variable
that gives a set of globs to match against the name of the branch
into which the merge is being made, to let users specify for which
branch fmt-merge-msg's output should be shortened.  When it is not
set, 'master' is used as the sole value of the variable by default.

The above move mostly reverts the pre-2.28 default in repositories
that have no relevant configuration.

Add a few tests to protect the behaviour with the new configuration
variable from future regression.

Helped-by: Linus Torvalds <torvalds@linux-foundation.org>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/config/fmt-merge-msg.txt | 12 ++++++++
 fmt-merge-msg.c                        | 38 +++++++++++++++++++++++---
 t/t6200-fmt-merge-msg.sh               | 20 ++++++++++++++
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
index c73cfa90b7..a8e8f74d0a 100644
--- a/Documentation/config/fmt-merge-msg.txt
+++ b/Documentation/config/fmt-merge-msg.txt
@@ -8,3 +8,15 @@ merge.log::
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
 	true is a synonym for 20.
+
+merge.suppressDest::
+	By adding a glob that matches the names of integration
+	branches to this multi-valued configuration variable, the
+	default merge message computed for merges into these
+	integration branches will omit " into <branch name>" from
+	its title.
++
+An element with an empty value can be used to clear the list
+of globs accumulated from previous configuration entries.
+When there is no `merge.suppressDest` variable defined, the
+default value of `master` is used for backward compatibility.
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 72d32bd73b..bd22e1ea88 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -10,6 +10,8 @@
 #include "commit-reach.h"
 
 static int use_branch_desc;
+static int suppress_dest_pattern_seen;
+static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
 
 int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 {
@@ -22,6 +24,14 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
 			merge_log_config = DEFAULT_MERGE_LOG_LEN;
 	} else if (!strcmp(key, "merge.branchdesc")) {
 		use_branch_desc = git_config_bool(key, value);
+	} else if (!strcmp(key, "merge.suppressdest")) {
+		if (!value)
+			return config_error_nonbool(key);
+		if (!*value)
+			string_list_clear(&suppress_dest_patterns, 0);
+		else
+			string_list_append(&suppress_dest_patterns, value);
+		suppress_dest_pattern_seen = 1;
 	} else {
 		return git_default_config(key, value, cb);
 	}
@@ -403,6 +413,24 @@ static void shortlog(const char *name,
 	string_list_clear(&subjects, 0);
 }
 
+/*
+ * See if dest_branch matches with any glob pattern on the
+ * suppress_dest_patterns list.
+ *
+ * We may want to also allow negative matches e.g. ":!glob" like we do
+ * for pathspec, but for now, let's keep it simple and stupid.
+ */
+static int dest_suppressed(const char *dest_branch)
+{
+	struct string_list_item *item;
+
+	for_each_string_list_item(item, &suppress_dest_patterns) {
+		if (!wildmatch(item->string, dest_branch, WM_PATHNAME))
+			return 1;
+	}
+	return 0;
+}
+
 static void fmt_merge_msg_title(struct strbuf *out,
 				const char *current_branch)
 {
@@ -451,10 +479,9 @@ static void fmt_merge_msg_title(struct strbuf *out,
 			strbuf_addf(out, " of %s", srcs.items[i].string);
 	}
 
-	if (!strcmp("master", current_branch))
-		strbuf_addch(out, '\n');
-	else
-		strbuf_addf(out, " into %s\n", current_branch);
+	if (!dest_suppressed(current_branch))
+		strbuf_addf(out, " into %s", current_branch);
+	strbuf_addch(out, '\n');
 }
 
 static void fmt_tag_signature(struct strbuf *tagbuf,
@@ -599,6 +626,9 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
 	void *current_branch_to_free;
 	struct merge_parents merge_parents;
 
+	if (!suppress_dest_pattern_seen)
+		string_list_append(&suppress_dest_patterns, "master");
+
 	memset(&merge_parents, 0, sizeof(merge_parents));
 
 	/* get current branch */
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index e4c2a6eca4..7d549748ef 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -542,4 +542,24 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	test_cmp expected .git/MERGE_MSG
 '
 
+test_expect_success 'merge.suppressDest configuration' '
+	git checkout -B side master &&
+	git commit --allow-empty -m "One step ahead" &&
+	git checkout master &&
+	git fetch . side &&
+
+	git -c merge.suppressDest="" fmt-merge-msg <.git/FETCH_HEAD >full.1 &&
+	head -n1 full.1 >actual &&
+	grep -e "Merge branch .side. into master" actual &&
+
+	git -c merge.suppressDest="mast" fmt-merge-msg <.git/FETCH_HEAD >full.2 &&
+	head -n1 full.2 >actual &&
+	grep -e "Merge branch .side. into master$" actual &&
+
+	git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
+	head -n1 full.3 >actual &&
+	grep -e "Merge branch .side." actual &&
+	! grep -e " into master$" actual
+'
+
 test_done
-- 
2.28.0


^ permalink raw reply related	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially"
  2020-07-30 18:02                 ` [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" Junio C Hamano
@ 2020-07-30 19:10                   ` Eric Sunshine
  2020-07-30 19:40                     ` Junio C Hamano
  0 siblings, 1 reply; 42+ messages in thread
From: Eric Sunshine @ 2020-07-30 19:10 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Git List

/On Thu, Jul 30, 2020 at 2:03 PM Junio C Hamano <gitster@pobox.com> wrote:
> This reverts commit 489947cee5095b168cbac111ff7bd1eadbbd90dd, which
> stopped treating merges into the 'master' branch any specially when

s/any specially/specially/
...or...
s/any specially/as special/

> preparing the default merge message.  As the goal was not to have
> any single branch designated as special, it solved it by leaving the
> "into <branchname>" at the end of the title of the default merge
> message for any and all branches.  An obvious and easy alternative
> to treat everybody equally could have been to remove it for every
> branch, but that involves loss of information.
>
> We'll introduce a new mechanism to let end-users specify merges into
> which branches would omit the "into <branchname>" from the title of
> the default merge message, and make the mechanism, when unconfigured,
> treat the traditional 'master' special again, so all the changes to
> the tests we made earlier will become unnecessary, as these tests
> will be run with out configuring the said new mechanism.

s/with out/without/

> Signed-off-by: Junio C Hamano <gitster@pobox.com>

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially"
  2020-07-30 19:10                   ` Eric Sunshine
@ 2020-07-30 19:40                     ` Junio C Hamano
  0 siblings, 0 replies; 42+ messages in thread
From: Junio C Hamano @ 2020-07-30 19:40 UTC (permalink / raw)
  To: Eric Sunshine; +Cc: Git List

Eric Sunshine <sunshine@sunshineco.com> writes:

> /On Thu, Jul 30, 2020 at 2:03 PM Junio C Hamano <gitster@pobox.com> wrote:
>> This reverts commit 489947cee5095b168cbac111ff7bd1eadbbd90dd, which
>> stopped treating merges into the 'master' branch any specially when
>
> s/any specially/specially/
> ...or...
> s/any specially/as special/
>
>> preparing the default merge message.  As the goal was not to have
>> any single branch designated as special, it solved it by leaving the
>> "into <branchname>" at the end of the title of the default merge
>> message for any and all branches.  An obvious and easy alternative
>> to treat everybody equally could have been to remove it for every
>> branch, but that involves loss of information.
>>
>> We'll introduce a new mechanism to let end-users specify merges into
>> which branches would omit the "into <branchname>" from the title of
>> the default merge message, and make the mechanism, when unconfigured,
>> treat the traditional 'master' special again, so all the changes to
>> the tests we made earlier will become unnecessary, as these tests
>> will be run with out configuring the said new mechanism.
>
> s/with out/without/
>
>> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Thanks.

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-30 18:02               ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
  2020-07-30 18:02                 ` [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" Junio C Hamano
  2020-07-30 18:02                 ` [PATCH v3 2/2] fmt-merge-msg: allow merge destination to be omitted again Junio C Hamano
@ 2020-07-31  0:42                 ` Jeff King
  2020-07-31  2:04                   ` Junio C Hamano
  2 siblings, 1 reply; 42+ messages in thread
From: Jeff King @ 2020-07-31  0:42 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

On Thu, Jul 30, 2020 at 11:02:35AM -0700, Junio C Hamano wrote:

> So, this is the third iteration, which separates the reversion that
> involves too many uninteresting test changes, and the implementation
> of the new feature proper.

Thanks, that did make it much easier to read.

> Two things that changed in the implementation since the previous
> iterations are
> 
>  - An assignment-less 'truth', i.e.
> 
> 	[merge] suppressDest
> 
>    is now an error ("missing value for 'merge.suppressDest'"), not
>    "clear the list", which should be spelled as an empty string, i.e.
> 
>         [merge] suppressDest = ""

OK. I don't have a preference either way on the "truth" behavior, but
certainly considering it an error is the conservative thing.

>  - Scanning of dest_patterns to see if "into <branch>" is suppressed
>    for the current_branch is done in a helper function to make the
>    main codeflow easier to read, as suggested by Peff.

Thanks.

This version looks OK to me. The remaining issues that came up in
earlier discussion but I didn't see you weigh in on are:

  - what should happen with a detached HEAD? We'd match HEAD in the
    suppressDest config, which I think is quite reasonable. Not sure if
    it's worth documenting or testing that specifically.

  - should "master" be in the list even if you configure a value? That
    would do the wrong thing if you have a non-integration master, but
    that seems unlikely. And it would do the right thing if somebody
    later puts "main" in merge.suppressDest, but still occasionally
    works with "master" repos (where "right" is defined as "what they
    probably wanted", but it is perhaps a bit magical).

  - what's the plan if we do switch init.defaultBranch to "main"? Would
    we add default_branch() to the list of defaults alongside "master",
    or just add "main", or just leave it and let people configure
    independently? It doesn't need to be decided now, but maybe worth
    thinking about.

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:57                 ` Linus Torvalds
@ 2020-07-31  0:44                   ` Jeff King
  0 siblings, 0 replies; 42+ messages in thread
From: Jeff King @ 2020-07-31  0:44 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Junio C Hamano, Johannes Schindelin, Git List Mailing

On Wed, Jul 29, 2020 at 05:57:52PM -0700, Linus Torvalds wrote:

> The reason I ended up with my hook is that a number of people send me
> their pull requests using the ssh address anyway, because they as
> maintainers end up having kernel.org accounts, and that's how they
> interact with it.
> 
> So I actually end up wanting to rewrite it to use the public address
> even if the insteadOf logic didn't trigger, because those ssh
> addresses just don't make sense in the public history, and there's an
> easy 1:1 translation to the public mirrors.

Ah, that makes sense. So the feature you'd want really is "rewrite this
when mentioning the url publicly". I do think it may be a problem other
folks have, but it's also easily solved (and more) with a hook. Since
nobody else has mentioned it, I'm willing to punt on it for now. If it
comes up again, we should think about having a friendlier way to do it.

Thanks for clarifying.

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  8:17       ` lego_12239
@ 2020-07-31  0:57         ` Jeff King
  2020-07-31  8:19           ` Oleg
  0 siblings, 1 reply; 42+ messages in thread
From: Jeff King @ 2020-07-31  0:57 UTC (permalink / raw)
  To: lego_12239; +Cc: Jonathan Nieder, Git List Mailing

On Thu, Jul 30, 2020 at 11:17:43AM +0300, lego_12239@rambler.ru wrote:

> On Wed, Jul 29, 2020 at 01:38:56PM -0700, Jonathan Nieder wrote:
> > The commit message describes its intent
> > 
> >   commit 489947cee5095b168cbac111ff7bd1eadbbd90dd
> >   Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> >   Date:   Tue Jun 23 22:33:23 2020 +0000
> > 
> >       fmt-merge-msg: stop treating `master` specially
> > 
> >       In the context of many projects renaming their primary branch names away
> >       from `master`, Git wants to stop treating the `master` branch specially.
> 
> Wow. Jonathan, you are a good student of Goebbels! "many projects" :-D.
> You lie. These are few but very noisy projects. Don't kid youself.

Please keep the tone on the list civil. If you want to disagree, fine,
but "you lie" is inflammatory and unconstructive.

In general, also please keep in mind whether any comments are adding
value to the discussion. In particular:

  - the text you are responding to isn't even Jonathan's; it was a
    quoted commit message to give context.

  - his point is unchanged by whether you agree with "many" in the
    original or not. Focusing on that is just derailing the
    conversation.

  - if you really do want re-open the argument about whether projects
    are interested in changing branch names, it might help to provide
    some actual data. Most of the data-less points (on both sides) have
    already been made in past discussions.

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-31  0:42                 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Jeff King
@ 2020-07-31  2:04                   ` Junio C Hamano
  2020-07-31  2:22                     ` Jeff King
  0 siblings, 1 reply; 42+ messages in thread
From: Junio C Hamano @ 2020-07-31  2:04 UTC (permalink / raw)
  To: Jeff King; +Cc: git

Jeff King <peff@peff.net> writes:

> This version looks OK to me. The remaining issues that came up in
> earlier discussion but I didn't see you weigh in on are:
>
>   - what should happen with a detached HEAD? We'd match HEAD in the
>     suppressDest config, which I think is quite reasonable. Not sure if
>     it's worth documenting or testing that specifically.

I think what the code with posted patch happens to do is just fine.
If you say "git -c merge.suppressDest=HEA? merge $topic" while on a
detached HEAD, you'll get "into HEAD" omitted.

In a workflow where you'd do

	$ git co master^0
	... enumerate the topics merged in master..jch, and redo the
	... merge, but with updated versions of these topics
	$ git shortlog jch..HEAD
	$ git range-diff jch...HEAD
	$ git diff jch..HEAD
	... after inspection, find the result satisfactory, and ...
	$ git co -B jch

I would strongly suspect that hiding "into HEAD" is not enough, so I
do not think HEAD is all that relevant in the first place.

You'd rather want to "lie" about the destination branch while
redoing these merges, perhaps with

	$ git merge --pretend-dest=jch topic-name

with your HEAD detached, and tell fmt-merge-msg to pretend that the
merge is being made into jch branch.  And that is outside the scope
of this patch, though it might be a good #leftoverbits candidate.

>   - should "master" be in the list even if you configure a value? That
>     would do the wrong thing if you have a non-integration master, but
>     that seems unlikely. And it would do the right thing if somebody
>     later puts "main" in merge.suppressDest, but still occasionally
>     works with "master" repos (where "right" is defined as "what they
>     probably wanted", but it is perhaps a bit magical).

If you configure, you can configure it fully without manually
clearing first.  If you do not configure, you get a backward
compatible default.  I think that is the only sensible semantics.

Besides, I thought we were aiming to make 'master' less special.
When a user already has a concrete list of things to use shorter
merge title for, why should 'master' be magically added to the list
and force the user to explicitly clear it?  I do not think that
makes much sense.

>   - what's the plan if we do switch init.defaultBranch to "main"? Would
>     we add default_branch() to the list of defaults alongside "master",
>     or just add "main", or just leave it and let people configure
>     independently? It doesn't need to be decided now, but maybe worth
>     thinking about.

My understanding is that much more instances of repositories come to
exist by cloning than running "git init".  Hence, the value you set
to the init.defaultBranch has no relevance to the name of the
primary branch in majority of your repositories, whose primary branch
is what their origin has designated before/when you cloned.

And the latter, "what is the primary branch name for this particular
repository?", is what we want to ask here.  The answer to "what is
the first branch name for new repository I will create?" is not a
good proxy for that.

I do not mind too much, even though I doubt it will be all that
useful, if we taught "init" and "clone" to record which branch is
the primary one in the repository they created.  We'd need to add
the repo_primary_branch_name() helper to allow this caller to
replace the hardcoded 'master' in the patch with it, just like
"init" and "clone" may ask the repo_default_branch_name() helper
what the first branch name ought to be.

In any case, I do not think I want to see more reliance of the
notion that there always is one and only one single special branch
in the repository, so if we can get away without it, that would be
more preferrable.

Thanks.


^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-31  2:04                   ` Junio C Hamano
@ 2020-07-31  2:22                     ` Jeff King
  2020-07-31 20:03                       ` Taylor Blau
  0 siblings, 1 reply; 42+ messages in thread
From: Jeff King @ 2020-07-31  2:22 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

On Thu, Jul 30, 2020 at 07:04:15PM -0700, Junio C Hamano wrote:

> You'd rather want to "lie" about the destination branch while
> redoing these merges, perhaps with
> 
> 	$ git merge --pretend-dest=jch topic-name
> 
> with your HEAD detached, and tell fmt-merge-msg to pretend that the
> merge is being made into jch branch.  And that is outside the scope
> of this patch, though it might be a good #leftoverbits candidate.

Since nobody really asked for it, it may make sense to wait for such a
feature. After all, this is the just the starting text we put into the
merge message. You are always free to add the pretend branch yourself in
the editor.

> >   - should "master" be in the list even if you configure a value? That
> >     would do the wrong thing if you have a non-integration master, but
> >     that seems unlikely. And it would do the right thing if somebody
> >     later puts "main" in merge.suppressDest, but still occasionally
> >     works with "master" repos (where "right" is defined as "what they
> >     probably wanted", but it is perhaps a bit magical).
> 
> If you configure, you can configure it fully without manually
> clearing first.  If you do not configure, you get a backward
> compatible default.  I think that is the only sensible semantics.
> 
> Besides, I thought we were aiming to make 'master' less special.
> When a user already has a concrete list of things to use shorter
> merge title for, why should 'master' be magically added to the list
> and force the user to explicitly clear it?  I do not think that
> makes much sense.

It's magic-ness would be purely for backwards compatibility. IMHO
maintaining exact behavior with respect to this particular case was not
a big deal, but clearly Linus disagrees. But the "do the right thing
above" I mentioned above is "do the right thing even if the user _did_
switch their config to a new name, but forgot that they sometimes are
working with old repos". So it is perhaps an even weaker reason.

To be clear, I'm OK with the behavior in your patch. I just wanted to
make sure we thought through all of the implications.

> >   - what's the plan if we do switch init.defaultBranch to "main"? Would
> >     we add default_branch() to the list of defaults alongside "master",
> >     or just add "main", or just leave it and let people configure
> >     independently? It doesn't need to be decided now, but maybe worth
> >     thinking about.
> [...quite reasonable analysis that I agree with...]
> 
> In any case, I do not think I want to see more reliance of the
> notion that there always is one and only one single special branch
> in the repository, so if we can get away without it, that would be
> more preferrable.

Yeah, if the plan is to stop here then I'm OK with that. That makes
"master" special for historical reasons, but "main" or whatever never
got this special treatment by default. People have the ability to
configure if they choose, or they may not care either way.

We might get a feature request later that says "gee, I wish we did this
for 'main' by default without me having to configure it", but we can
cross that bridge when we come to it.

-Peff

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-31  0:57         ` Jeff King
@ 2020-07-31  8:19           ` Oleg
  0 siblings, 0 replies; 42+ messages in thread
From: Oleg @ 2020-07-31  8:19 UTC (permalink / raw)
  To: Git List Mailing

On Thu, Jul 30, 2020 at 08:57:21PM -0400, Jeff King wrote:
> On Thu, Jul 30, 2020 at 11:17:43AM +0300, lego_12239@rambler.ru wrote:
> > On Wed, Jul 29, 2020 at 01:38:56PM -0700, Jonathan Nieder wrote:
> > > The commit message describes its intent
> > >   commit 489947cee5095b168cbac111ff7bd1eadbbd90dd
> > >   Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> > >   Date:   Tue Jun 23 22:33:23 2020 +0000
> > > 
> > >       fmt-merge-msg: stop treating `master` specially
> > > 
> > >       In the context of many projects renaming their primary branch names away
> > >       from `master`, Git wants to stop treating the `master` branch specially.
> > 
> > Wow. Jonathan, you are a good student of Goebbels! "many projects" :-D.
> > You lie. These are few but very noisy projects. Don't kid youself.
> 
>   - the text you are responding to isn't even Jonathan's; it was a
>     quoted commit message to give context.

Yes. It's my mistake. Sorry.

>   - if you really do want re-open the argument about whether projects
>     are interested in changing branch names, it might help to provide
>     some actual data. Most of the data-less points (on both sides) have
>     already been made in past discussions.

Most of the actual data have already been made, but polytics won out over
common sense.

-- 
Олег Неманов (Oleg Nemanov)

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-31  2:22                     ` Jeff King
@ 2020-07-31 20:03                       ` Taylor Blau
  2020-07-31 20:12                         ` Junio C Hamano
  2020-08-01  7:15                         ` Michal Suchánek
  0 siblings, 2 replies; 42+ messages in thread
From: Taylor Blau @ 2020-07-31 20:03 UTC (permalink / raw)
  To: Jeff King; +Cc: Junio C Hamano, git

On Thu, Jul 30, 2020 at 10:22:17PM -0400, Jeff King wrote:
> On Thu, Jul 30, 2020 at 07:04:15PM -0700, Junio C Hamano wrote:
>
> > You'd rather want to "lie" about the destination branch while
> > redoing these merges, perhaps with
> >
> > 	$ git merge --pretend-dest=jch topic-name
> >
> > with your HEAD detached, and tell fmt-merge-msg to pretend that the
> > merge is being made into jch branch.  And that is outside the scope
> > of this patch, though it might be a good #leftoverbits candidate.
>
> Since nobody really asked for it, it may make sense to wait for such a
> feature. After all, this is the just the starting text we put into the
> merge message. You are always free to add the pretend branch yourself in
> the editor.
>
> > >   - should "master" be in the list even if you configure a value? That
> > >     would do the wrong thing if you have a non-integration master, but
> > >     that seems unlikely. And it would do the right thing if somebody
> > >     later puts "main" in merge.suppressDest, but still occasionally
> > >     works with "master" repos (where "right" is defined as "what they
> > >     probably wanted", but it is perhaps a bit magical).
> >
> > If you configure, you can configure it fully without manually
> > clearing first.  If you do not configure, you get a backward
> > compatible default.  I think that is the only sensible semantics.
> >
> > Besides, I thought we were aiming to make 'master' less special.
> > When a user already has a concrete list of things to use shorter
> > merge title for, why should 'master' be magically added to the list
> > and force the user to explicitly clear it?  I do not think that
> > makes much sense.
>
> It's magic-ness would be purely for backwards compatibility. IMHO
> maintaining exact behavior with respect to this particular case was not
> a big deal, but clearly Linus disagrees. But the "do the right thing
> above" I mentioned above is "do the right thing even if the user _did_
> switch their config to a new name, but forgot that they sometimes are
> working with old repos". So it is perhaps an even weaker reason.

I think that you could do this without treating 'master' as specially by
making 'merge.suppressDest' contain the value of 'init.defaultBranch'
(unless set otherwise).

This gets tricky when the fall-back value for 'init.defaultBranch'
changes, though. If it were to go from 'master' -> 'main', you'd want to
have both of those defaults in your 'merge.suppressDest' list, to avoid
breaking clients who still use 'master' (and expect 'into master' not to
show up in their merges).

So, I guess the rule would be: 'merge.suppressDest' contains the value
of 'init.defaultBranch' (or its default value) along with any previous
default values for 'init.defaultBranch', unless specified otherwise.

Apologies if this has already been suggested elsewhere and I glossed
past it.

> To be clear, I'm OK with the behavior in your patch. I just wanted to
> make sure we thought through all of the implications.

I am too.

> > >   - what's the plan if we do switch init.defaultBranch to "main"? Would
> > >     we add default_branch() to the list of defaults alongside "master",
> > >     or just add "main", or just leave it and let people configure
> > >     independently? It doesn't need to be decided now, but maybe worth
> > >     thinking about.
> > [...quite reasonable analysis that I agree with...]
> >
> > In any case, I do not think I want to see more reliance of the
> > notion that there always is one and only one single special branch
> > in the repository, so if we can get away without it, that would be
> > more preferrable.
>
> Yeah, if the plan is to stop here then I'm OK with that. That makes
> "master" special for historical reasons, but "main" or whatever never
> got this special treatment by default. People have the ability to
> configure if they choose, or they may not care either way.
>
> We might get a feature request later that says "gee, I wish we did this
> for 'main' by default without me having to configure it", but we can
> cross that bridge when we come to it.
>
> -Peff

Thanks,
Taylor

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-31 20:03                       ` Taylor Blau
@ 2020-07-31 20:12                         ` Junio C Hamano
  2020-07-31 20:17                           ` Taylor Blau
  2020-08-01  7:15                         ` Michal Suchánek
  1 sibling, 1 reply; 42+ messages in thread
From: Junio C Hamano @ 2020-07-31 20:12 UTC (permalink / raw)
  To: Taylor Blau; +Cc: Jeff King, git

Taylor Blau <me@ttaylorr.com> writes:

> I think that you could do this without treating 'master' as specially by
> making 'merge.suppressDest' contain the value of 'init.defaultBranch'
> (unless set otherwise).

My understanding is that much more instances of repositories come to
exist by cloning than running "git init".  Hence, the value you set
to the init.defaultBranch has no relevance to the name of the
primary branch in majority of your repositories, whose primary
branch is what their origin has designated before/when you cloned.

And the latter, "what is the primary branch name for this particular
repository?", is what we want to ask here.  The answer to "what is
the first branch name for new repository I will create?" is not a
good proxy for that.

Thanks.

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-31 20:12                         ` Junio C Hamano
@ 2020-07-31 20:17                           ` Taylor Blau
  0 siblings, 0 replies; 42+ messages in thread
From: Taylor Blau @ 2020-07-31 20:17 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Taylor Blau, Jeff King, git

On Fri, Jul 31, 2020 at 01:12:02PM -0700, Junio C Hamano wrote:
> Taylor Blau <me@ttaylorr.com> writes:
>
> > I think that you could do this without treating 'master' as specially by
> > making 'merge.suppressDest' contain the value of 'init.defaultBranch'
> > (unless set otherwise).
>
> My understanding is that much more instances of repositories come to
> exist by cloning than running "git init".  Hence, the value you set
> to the init.defaultBranch has no relevance to the name of the
> primary branch in majority of your repositories, whose primary
> branch is what their origin has designated before/when you cloned.
>
> And the latter, "what is the primary branch name for this particular
> repository?", is what we want to ask here.  The answer to "what is
> the first branch name for new repository I will create?" is not a
> good proxy for that.

Aha, makes sense. Thanks for clarifying.

> Thanks.

Thanks,
Taylor

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>"
  2020-07-31 20:03                       ` Taylor Blau
  2020-07-31 20:12                         ` Junio C Hamano
@ 2020-08-01  7:15                         ` Michal Suchánek
  1 sibling, 0 replies; 42+ messages in thread
From: Michal Suchánek @ 2020-08-01  7:15 UTC (permalink / raw)
  To: Taylor Blau; +Cc: Jeff King, Junio C Hamano, git

On Fri, Jul 31, 2020 at 04:03:06PM -0400, Taylor Blau wrote:
> On Thu, Jul 30, 2020 at 10:22:17PM -0400, Jeff King wrote:
> > On Thu, Jul 30, 2020 at 07:04:15PM -0700, Junio C Hamano wrote:
> >
> > > You'd rather want to "lie" about the destination branch while
> > > redoing these merges, perhaps with
> > >
> > > 	$ git merge --pretend-dest=jch topic-name
> > >
> > > with your HEAD detached, and tell fmt-merge-msg to pretend that the
> > > merge is being made into jch branch.  And that is outside the scope
> > > of this patch, though it might be a good #leftoverbits candidate.
> >
> > Since nobody really asked for it, it may make sense to wait for such a
> > feature. After all, this is the just the starting text we put into the
> > merge message. You are always free to add the pretend branch yourself in
> > the editor.
> >
> > > >   - should "master" be in the list even if you configure a value? That
> > > >     would do the wrong thing if you have a non-integration master, but
> > > >     that seems unlikely. And it would do the right thing if somebody
> > > >     later puts "main" in merge.suppressDest, but still occasionally
> > > >     works with "master" repos (where "right" is defined as "what they
> > > >     probably wanted", but it is perhaps a bit magical).
> > >
> > > If you configure, you can configure it fully without manually
> > > clearing first.  If you do not configure, you get a backward
> > > compatible default.  I think that is the only sensible semantics.
> > >
> > > Besides, I thought we were aiming to make 'master' less special.
> > > When a user already has a concrete list of things to use shorter
> > > merge title for, why should 'master' be magically added to the list
> > > and force the user to explicitly clear it?  I do not think that
> > > makes much sense.
> >
> > It's magic-ness would be purely for backwards compatibility. IMHO
> > maintaining exact behavior with respect to this particular case was not
> > a big deal, but clearly Linus disagrees. But the "do the right thing
> > above" I mentioned above is "do the right thing even if the user _did_
> > switch their config to a new name, but forgot that they sometimes are
> > working with old repos". So it is perhaps an even weaker reason.
> 
> I think that you could do this without treating 'master' as specially by
> making 'merge.suppressDest' contain the value of 'init.defaultBranch'
> (unless set otherwise).
> 
> This gets tricky when the fall-back value for 'init.defaultBranch'
> changes, though. If it were to go from 'master' -> 'main', you'd want to
> have both of those defaults in your 'merge.suppressDest' list, to avoid
> breaking clients who still use 'master' (and expect 'into master' not to
> show up in their merges).
> 
> So, I guess the rule would be: 'merge.suppressDest' contains the value
> of 'init.defaultBranch' (or its default value) along with any previous
> default values for 'init.defaultBranch', unless specified otherwise.
> 

IMHO this is way better than spome magic variable that you ahve to
assign magic value for it to have teh value you assign. Seen this in
systemd and it is not very nice to deal with.

Thanks

Michal

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-07-30  0:36             ` Junio C Hamano
  2020-07-30 18:02               ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
@ 2020-08-10 11:53               ` Johannes Schindelin
  2020-08-10 15:45                 ` Junio C Hamano
  1 sibling, 1 reply; 42+ messages in thread
From: Johannes Schindelin @ 2020-08-10 11:53 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Jeff King, Linus Torvalds, Git List Mailing

Hi Junio,

On Wed, 29 Jul 2020, Junio C Hamano wrote:

> Junio C Hamano <gitster@pobox.com> writes:
>
> > A rough outline I did while waiting for today's integration builds
> > to finish looks like this, which does not look _too_ bad.
>
> This time, with full test suite, documentation and a log message.
>
> A few bugs in the code are also fixed since the preview version.
>
>  - I was confused about wildmatch's return value.
>
>  - wildmatch is now called with WM_PATHNAME.
>
>  - Not just the "unvalued truth", but an empty string also works as
>    a "clear the list of globs" now.
>
>  - The final LF still needs to be added even when we suppress "into X".
>
> -- >8 --
> Subject: [PATCH] fmt-merge-msg: allow merge destination to be omitted again
>
> In Git 2.28, we stopped special casing 'master' when producing the
> default merge message by just removing the code to squelch "into
> 'master'" at the end of the message.
>
> Introduce multi-valued merge.suppressDest configuration variable
> that gives a set of globs to match against the name of the branch
> into which the merge is being made, to let users specify for which
> branch fmt-merge-msg's output should be shortened.  When it is not
> set, 'master' is used as the sole value of the variable by default.
>
> Because this reverts the behaviour to that of pre-2.28 in
> repositories that have no relevant configuration, revert most of the
> changes made to the tests back then.  At the end of t6200, add a few
> tests to document the behaviour with the new configuration variable
> and protect it from future regression.
>
> Helped-by: Jeff King <peff@peff.net>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Looks good to me, and apart from the config key (for which I also don't
have a better suggestion), this looks pretty much how I would have done it
(but refrained from doing because I really wanted the patch series to be
part of v2.28.0).

TBH I expected some discussion along the line "Shouldn't this be an
opt-in, with the initial default saying 'every branch except `master`'?",
but that seems not to have taken place.

Thank you!
Dscho

> ---
>  Documentation/config/fmt-merge-msg.txt        | 12 ++++
>  fmt-merge-msg.c                               | 24 ++++++-
>  t/t1507-rev-parse-upstream.sh                 |  2 +-
>  t/t4013-diff-various.sh                       |  4 +-
>  t/t4013/diff.log_--decorate=full_--all        |  2 +-
>  t/t4013/diff.log_--decorate_--all             |  2 +-
>  ...--patch-with-stat_--summary_master_--_dir_ |  2 +-
>  t/t4013/diff.log_--patch-with-stat_master     |  2 +-
>  .../diff.log_--patch-with-stat_master_--_dir_ |  2 +-
>  ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
>  ..._--root_--patch-with-stat_--summary_master |  2 +-
>  .../diff.log_--root_--patch-with-stat_master  |  2 +-
>  ...root_-c_--patch-with-stat_--summary_master |  2 +-
>  t/t4013/diff.log_--root_-p_master             |  2 +-
>  t/t4013/diff.log_--root_master                |  2 +-
>  t/t4013/diff.log_-m_-p_--first-parent_master  |  2 +-
>  t/t4013/diff.log_-m_-p_master                 |  4 +-
>  t/t4013/diff.log_-p_--first-parent_master     |  2 +-
>  t/t4013/diff.log_-p_master                    |  2 +-
>  t/t4013/diff.log_master                       |  2 +-
>  t/t4013/diff.show_--first-parent_master       |  2 +-
>  t/t4013/diff.show_-c_master                   |  2 +-
>  t/t4013/diff.show_-m_master                   |  4 +-
>  t/t4013/diff.show_master                      |  2 +-
>  ...ot_--cc_--patch-with-stat_--summary_master |  2 +-
>  ...root_-c_--patch-with-stat_--summary_master |  2 +-
>  t/t4202-log.sh                                | 72 +++++++++----------
>  t/t6200-fmt-merge-msg.sh                      | 56 ++++++++++-----
>  t/t7600-merge.sh                              | 14 ++--
>  t/t7608-merge-messages.sh                     | 10 +--
>  30 files changed, 148 insertions(+), 94 deletions(-)
>
> diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
> index c73cfa90b7..a8e8f74d0a 100644
> --- a/Documentation/config/fmt-merge-msg.txt
> +++ b/Documentation/config/fmt-merge-msg.txt
> @@ -8,3 +8,15 @@ merge.log::
>  	most the specified number of one-line descriptions from the
>  	actual commits that are being merged.  Defaults to false, and
>  	true is a synonym for 20.
> +
> +merge.suppressDest::
> +	By adding a glob that matches the names of integration
> +	branches to this multi-valued configuration variable, the
> +	default merge message computed for merges into these
> +	integration branches will omit " into <branch name>" from
> +	its title.
> ++
> +An element with an empty value can be used to clear the list
> +of globs accumulated from previous configuration entries.
> +When there is no `merge.suppressDest` variable defined, the
> +default value of `master` is used for backward compatibility.
> diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
> index cfb8ff2f33..5fe879207b 100644
> --- a/fmt-merge-msg.c
> +++ b/fmt-merge-msg.c
> @@ -10,6 +10,8 @@
>  #include "commit-reach.h"
>
>  static int use_branch_desc;
> +static int suppress_dest_pattern_seen;
> +static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
>
>  int fmt_merge_msg_config(const char *key, const char *value, void *cb)
>  {
> @@ -22,6 +24,12 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb)
>  			merge_log_config = DEFAULT_MERGE_LOG_LEN;
>  	} else if (!strcmp(key, "merge.branchdesc")) {
>  		use_branch_desc = git_config_bool(key, value);
> +	} else if (!strcmp(key, "merge.suppressdest")) {
> +		if (!value || !*value)
> +			string_list_clear(&suppress_dest_patterns, 0);
> +		else
> +			string_list_append(&suppress_dest_patterns, value);
> +		suppress_dest_pattern_seen = 1;
>  	} else {
>  		return git_default_config(key, value, cb);
>  	}
> @@ -408,6 +416,8 @@ static void fmt_merge_msg_title(struct strbuf *out,
>  {
>  	int i = 0;
>  	char *sep = "";
> +	struct string_list_item *item;
> +	int suppress_merge_dest = 0;
>
>  	strbuf_addstr(out, "Merge ");
>  	for (i = 0; i < srcs.nr; i++) {
> @@ -451,7 +461,16 @@ static void fmt_merge_msg_title(struct strbuf *out,
>  			strbuf_addf(out, " of %s", srcs.items[i].string);
>  	}
>
> -	strbuf_addf(out, " into %s\n", current_branch);
> +	for_each_string_list_item(item, &suppress_dest_patterns) {
> +		if (!wildmatch(item->string, current_branch, WM_PATHNAME)) {
> +			suppress_merge_dest = 1;
> +			break;
> +		}
> +	}
> +
> +	if (!suppress_merge_dest)
> +		strbuf_addf(out, " into %s", current_branch);
> +	strbuf_addch(out, '\n');
>  }
>
>  static void fmt_tag_signature(struct strbuf *tagbuf,
> @@ -596,6 +615,9 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
>  	void *current_branch_to_free;
>  	struct merge_parents merge_parents;
>
> +	if (!suppress_dest_pattern_seen)
> +		string_list_append(&suppress_dest_patterns, "master");
> +
>  	memset(&merge_parents, 0, sizeof(merge_parents));
>
>  	/* get current branch */
> diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
> index f213aa8053..dfc0d96d8a 100755
> --- a/t/t1507-rev-parse-upstream.sh
> +++ b/t/t1507-rev-parse-upstream.sh
> @@ -137,7 +137,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
>  	git branch -t new my-side@{u} &&
>  	git merge -s ours new@{u} &&
>  	git show -s --pretty=tformat:%s >actual &&
> -	echo "Merge remote-tracking branch ${SQ}origin/side${SQ} into master" >expect &&
> +	echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect &&
>  	test_cmp expect actual
>  )
>  '
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index 43267d6024..3f60f7d96c 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -117,12 +117,12 @@ test_expect_success setup '
>
>  : <<\EOF
>  ! [initial] Initial
> - * [master] Merge branch 'side' into master
> + * [master] Merge branch 'side'
>    ! [rearrange] Rearranged lines in dir/sub
>     ! [side] Side
>  ----
>    +  [rearrange] Rearranged lines in dir/sub
> - -   [master] Merge branch 'side' into master
> + -   [master] Merge branch 'side'
>   * + [side] Side
>   *   [master^] Third
>   *   [master~2] Second
> diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
> index c56783b985..3f9b872ece 100644
> --- a/t/t4013/diff.log_--decorate=full_--all
> +++ b/t/t4013/diff.log_--decorate=full_--all
> @@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (refs/heads/side)
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
> index 1cbdc038f4..f5e20e1e14 100644
> --- a/t/t4013/diff.log_--decorate_--all
> +++ b/t/t4013/diff.log_--decorate_--all
> @@ -31,7 +31,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a (side)
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
> index f5b1b6516b..a18f1472a9 100644
> --- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
> +++ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master
> index af23803cdc..ae425c4672 100644
> --- a/t/t4013/diff.log_--patch-with-stat_master
> +++ b/t/t4013/diff.log_--patch-with-stat_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
> index 814098fbf8..d5207cadf4 100644
> --- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_
> +++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
> index b927fe4a98..0fc1e8cd71 100644
> --- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
> index 6db3cea329..dffc09dde9 100644
> --- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master
> index 98e9c320c3..55aa98012d 100644
> --- a/t/t4013/diff.log_--root_--patch-with-stat_master
> +++ b/t/t4013/diff.log_--root_--patch-with-stat_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
> index b61b1117ae..019d85f7de 100644
> --- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_master
> index 345bd9e8a9..b42c334439 100644
> --- a/t/t4013/diff.log_--root_-p_master
> +++ b/t/t4013/diff.log_--root_-p_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_master
> index db56b1fe6b..e8f46159da 100644
> --- a/t/t4013/diff.log_--root_master
> +++ b/t/t4013/diff.log_--root_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_master
> index bcadb50e26..7a0073f529 100644
> --- a/t/t4013/diff.log_-m_-p_--first-parent_master
> +++ b/t/t4013/diff.log_-m_-p_--first-parent_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --git a/dir/sub b/dir/sub
>  index cead32e..992913c 100644
> diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_master
> index 2acf43a9fb..9ca62a01ed 100644
> --- a/t/t4013/diff.log_-m_-p_master
> +++ b/t/t4013/diff.log_-m_-p_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --git a/dir/sub b/dir/sub
>  index cead32e..992913c 100644
> @@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --git a/dir/sub b/dir/sub
>  index 7289e35..992913c 100644
> diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
> index c6a5876d80..3fc896d424 100644
> --- a/t/t4013/diff.log_-p_--first-parent_master
> +++ b/t/t4013/diff.log_-p_--first-parent_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_master
> index 1841cded94..bf1326dc36 100644
> --- a/t/t4013/diff.log_-p_master
> +++ b/t/t4013/diff.log_-p_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_master
> index f8ec445eb3..a8f6ce5abd 100644
> --- a/t/t4013/diff.log_master
> +++ b/t/t4013/diff.log_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.show_--first-parent_master b/t/t4013/diff.show_--first-parent_master
> index 94548f4598..3dcbe473a0 100644
> --- a/t/t4013/diff.show_--first-parent_master
> +++ b/t/t4013/diff.show_--first-parent_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --git a/dir/sub b/dir/sub
>  index cead32e..992913c 100644
> diff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_master
> index 1c46ed64fd..81aba8da96 100644
> --- a/t/t4013/diff.show_-c_master
> +++ b/t/t4013/diff.show_-c_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --combined dir/sub
>  index cead32e,7289e35..992913c
> diff --git a/t/t4013/diff.show_-m_master b/t/t4013/diff.show_-m_master
> index 7559fc22f8..4ea2ee453d 100644
> --- a/t/t4013/diff.show_-m_master
> +++ b/t/t4013/diff.show_-m_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --git a/dir/sub b/dir/sub
>  index cead32e..992913c 100644
> @@ -33,7 +33,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --git a/dir/sub b/dir/sub
>  index 7289e35..992913c 100644
> diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master
> index 57091c5d90..fb08ce0e46 100644
> --- a/t/t4013/diff.show_master
> +++ b/t/t4013/diff.show_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>  diff --cc dir/sub
>  index cead32e,7289e35..992913c
> diff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
> index 5f13a71bb5..30aae7817b 100644
> --- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
> index 8acb88267b..d1d32bd34c 100644
> --- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
> @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
>
> -    Merge branch 'side' into master
> +    Merge branch 'side'
>
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index fd9af658af..a0930599aa 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -483,7 +483,7 @@ test_expect_success 'set up merge history' '
>  '
>
>  cat > expect <<\EOF
> -*   Merge branch 'side' into master
> +*   Merge branch 'side'
>  |\
>  | * side-2
>  | * side-1
> @@ -502,7 +502,7 @@ test_expect_success 'log --graph with merge' '
>  '
>
>  cat > expect <<\EOF
> -| | | *   Merge branch 'side' into master
> +| | | *   Merge branch 'side'
>  | | | |\
>  | | | | * side-2
>  | | | | * side-1
> @@ -521,7 +521,7 @@ test_expect_success 'log --graph --line-prefix="| | | " with merge' '
>  '
>
>  cat > expect.colors <<\EOF
> -*   Merge branch 'side' into master
> +*   Merge branch 'side'
>  <BLUE>|<RESET><CYAN>\<RESET>
>  <BLUE>|<RESET> * side-2
>  <BLUE>|<RESET> * side-1
> @@ -555,7 +555,7 @@ cat > expect <<\EOF
>  |\  Merge: A B
>  | | Author: A U Thor <author@example.com>
>  | |
> -| |     Merge branch 'side' into master
> +| |     Merge branch 'side'
>  | |
>  | * commit tags/side-2
>  | | Author: A U Thor <author@example.com>
> @@ -632,11 +632,11 @@ test_expect_success 'set up more tangled history' '
>  '
>
>  cat > expect <<\EOF
> -*   Merge tag 'reach' into master
> +*   Merge tag 'reach'
>  |\
>  | \
>  |  \
> -*-. \   Merge tags 'octopus-a' and 'octopus-b' into master
> +*-. \   Merge tags 'octopus-a' and 'octopus-b'
>  |\ \ \
>  * | | | seventh
>  | | * | octopus-b
> @@ -646,14 +646,14 @@ cat > expect <<\EOF
>  |/ /
>  | * reach
>  |/
> -*   Merge branch 'tangle' into master
> +*   Merge branch 'tangle'
>  |\
>  | *   Merge branch 'side' (early part) into tangle
>  | |\
>  | * \   Merge branch 'master' (early part) into tangle
>  | |\ \
>  | * | | tangle-a
> -* | | |   Merge branch 'side' into master
> +* | | |   Merge branch 'side'
>  |\ \ \ \
>  | * | | | side-2
>  | | |_|/
> @@ -735,16 +735,16 @@ test_expect_success 'log.decorate configuration' '
>
>  test_expect_success 'decorate-refs with glob' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh
>  	octopus-b (octopus-b)
>  	octopus-a (octopus-a)
>  	reach
>  	EOF
>  	cat >expect.no-decorate <<-\EOF &&
> -	Merge-tag-reach-into-master
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh
>  	octopus-b
>  	octopus-a
> @@ -765,8 +765,8 @@ test_expect_success 'decorate-refs with glob' '
>
>  test_expect_success 'decorate-refs without globs' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh
>  	octopus-b
>  	octopus-a
> @@ -779,8 +779,8 @@ test_expect_success 'decorate-refs without globs' '
>
>  test_expect_success 'multiple decorate-refs' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh
>  	octopus-b (octopus-b)
>  	octopus-a (octopus-a)
> @@ -794,8 +794,8 @@ test_expect_success 'multiple decorate-refs' '
>
>  test_expect_success 'decorate-refs-exclude with glob' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master (HEAD -> master)
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach (HEAD -> master)
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh (tag: seventh)
>  	octopus-b (tag: octopus-b)
>  	octopus-a (tag: octopus-a)
> @@ -811,8 +811,8 @@ test_expect_success 'decorate-refs-exclude with glob' '
>
>  test_expect_success 'decorate-refs-exclude without globs' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master (HEAD -> master)
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach (HEAD -> master)
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh (tag: seventh)
>  	octopus-b (tag: octopus-b, octopus-b)
>  	octopus-a (tag: octopus-a, octopus-a)
> @@ -828,8 +828,8 @@ test_expect_success 'decorate-refs-exclude without globs' '
>
>  test_expect_success 'multiple decorate-refs-exclude' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master (HEAD -> master)
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach (HEAD -> master)
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh (tag: seventh)
>  	octopus-b (tag: octopus-b)
>  	octopus-a (tag: octopus-a)
> @@ -851,8 +851,8 @@ test_expect_success 'multiple decorate-refs-exclude' '
>
>  test_expect_success 'decorate-refs and decorate-refs-exclude' '
>  	cat >expect.no-decorate <<-\EOF &&
> -	Merge-tag-reach-into-master (master)
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach (master)
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh
>  	octopus-b
>  	octopus-a
> @@ -866,8 +866,8 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' '
>
>  test_expect_success 'deocrate-refs and log.excludeDecoration' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master (master)
> -	Merge-tags-octopus-a-and-octopus-b-into-master
> +	Merge-tag-reach (master)
> +	Merge-tags-octopus-a-and-octopus-b
>  	seventh
>  	octopus-b (octopus-b)
>  	octopus-a (octopus-a)
> @@ -881,10 +881,10 @@ test_expect_success 'deocrate-refs and log.excludeDecoration' '
>
>  test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
>  	cat >expect.decorate <<-\EOF &&
> -	Merge-tag-reach-into-master (HEAD -> master)
> +	Merge-tag-reach (HEAD -> master)
>  	reach (tag: reach, reach)
>  	seventh (tag: seventh)
> -	Merge-branch-tangle-into-master
> +	Merge-branch-tangle
>  	Merge-branch-side-early-part-into-tangle (tangle)
>  	tangle-a (tag: tangle-a)
>  	EOF
> @@ -1068,7 +1068,7 @@ cat >expect <<\EOF
>  |\  Merge: MERGE_PARENTS
>  | | Author: A U Thor <author@example.com>
>  | |
> -| |     Merge branch 'tangle' into master
> +| |     Merge branch 'tangle'
>  | |
>  | *   commit COMMIT_OBJECT_NAME
>  | |\  Merge: MERGE_PARENTS
> @@ -1102,7 +1102,7 @@ cat >expect <<\EOF
>  |\ \ \ \  Merge: MERGE_PARENTS
>  | | | | | Author: A U Thor <author@example.com>
>  | | | | |
> -| | | | |     Merge branch 'side' into master
> +| | | | |     Merge branch 'side'
>  | | | | |
>  | * | | | commit COMMIT_OBJECT_NAME
>  | | |_|/  Author: A U Thor <author@example.com>
> @@ -1343,7 +1343,7 @@ cat >expect <<\EOF
>  *** |\  Merge: MERGE_PARENTS
>  *** | | Author: A U Thor <author@example.com>
>  *** | |
> -*** | |     Merge branch 'tangle' into master
> +*** | |     Merge branch 'tangle'
>  *** | |
>  *** | *   commit COMMIT_OBJECT_NAME
>  *** | |\  Merge: MERGE_PARENTS
> @@ -1377,7 +1377,7 @@ cat >expect <<\EOF
>  *** |\ \ \ \  Merge: MERGE_PARENTS
>  *** | | | | | Author: A U Thor <author@example.com>
>  *** | | | | |
> -*** | | | | |     Merge branch 'side' into master
> +*** | | | | |     Merge branch 'side'
>  *** | | | | |
>  *** | * | | | commit COMMIT_OBJECT_NAME
>  *** | | |_|/  Author: A U Thor <author@example.com>
> @@ -1540,8 +1540,8 @@ cat >expect <<-\EOF
>  * reach
>  |
>  | A	reach.t
> -* Merge branch 'tangle' into master
> -*   Merge branch 'side' into master
> +* Merge branch 'tangle'
> +*   Merge branch 'side'
>  |\
>  | * side-2
>  |
> @@ -1562,8 +1562,8 @@ cat >expect <<-\EOF
>  * reach
>  |
>  | reach.t
> -* Merge branch 'tangle' into master
> -*   Merge branch 'side' into master
> +* Merge branch 'tangle'
> +*   Merge branch 'side'
>  |\
>  | * side-2
>  |
> diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
> index 2b3fd498d0..7d549748ef 100755
> --- a/t/t6200-fmt-merge-msg.sh
> +++ b/t/t6200-fmt-merge-msg.sh
> @@ -79,7 +79,7 @@ test_expect_success GPG 'set up a signed tag' '
>  '
>
>  test_expect_success 'message for merging local branch' '
> -	echo "Merge branch ${apos}left${apos} into master" >expected &&
> +	echo "Merge branch ${apos}left${apos}" >expected &&
>
>  	git checkout master &&
>  	git fetch . left &&
> @@ -107,7 +107,7 @@ test_expect_success GPG 'message for merging local tag signed by unknown key' '
>  '
>
>  test_expect_success 'message for merging external branch' '
> -	echo "Merge branch ${apos}left${apos} of $(pwd) into master" >expected &&
> +	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
>
>  	git checkout master &&
>  	git fetch "$(pwd)" left &&
> @@ -118,7 +118,7 @@ test_expect_success 'message for merging external branch' '
>
>  test_expect_success '[merge] summary/log configuration' '
>  	cat >expected <<-EOF &&
> -	Merge branch ${apos}left${apos} into master
> +	Merge branch ${apos}left${apos}
>
>  	# By Another Author (3) and A U Thor (2)
>  	# Via Another Committer
> @@ -160,7 +160,7 @@ test_expect_success 'setup FETCH_HEAD' '
>
>  test_expect_success 'merge.log=3 limits shortlog length' '
>  	cat >expected <<-EOF &&
> -	Merge branch ${apos}left${apos} into master
> +	Merge branch ${apos}left${apos}
>
>  	# By Another Author (3) and A U Thor (2)
>  	# Via Another Committer
> @@ -177,7 +177,7 @@ test_expect_success 'merge.log=3 limits shortlog length' '
>
>  test_expect_success 'merge.log=5 shows all 5 commits' '
>  	cat >expected <<-EOF &&
> -	Merge branch ${apos}left${apos} into master
> +	Merge branch ${apos}left${apos}
>
>  	# By Another Author (3) and A U Thor (2)
>  	# Via Another Committer
> @@ -195,7 +195,7 @@ test_expect_success 'merge.log=5 shows all 5 commits' '
>
>  test_expect_success '--log=5 with custom comment character' '
>  	cat >expected <<-EOF &&
> -	Merge branch ${apos}left${apos} into master
> +	Merge branch ${apos}left${apos}
>
>  	x By Another Author (3) and A U Thor (2)
>  	x Via Another Committer
> @@ -212,14 +212,14 @@ test_expect_success '--log=5 with custom comment character' '
>  '
>
>  test_expect_success 'merge.log=0 disables shortlog' '
> -	echo "Merge branch ${apos}left${apos} into master" >expected &&
> +	echo "Merge branch ${apos}left${apos}" >expected &&
>  	git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
>  	test_cmp expected actual
>  '
>
>  test_expect_success '--log=3 limits shortlog length' '
>  	cat >expected <<-EOF &&
> -	Merge branch ${apos}left${apos} into master
> +	Merge branch ${apos}left${apos}
>
>  	# By Another Author (3) and A U Thor (2)
>  	# Via Another Committer
> @@ -236,7 +236,7 @@ test_expect_success '--log=3 limits shortlog length' '
>
>  test_expect_success '--log=5 shows all 5 commits' '
>  	cat >expected <<-EOF &&
> -	Merge branch ${apos}left${apos} into master
> +	Merge branch ${apos}left${apos}
>
>  	# By Another Author (3) and A U Thor (2)
>  	# Via Another Committer
> @@ -253,13 +253,13 @@ test_expect_success '--log=5 shows all 5 commits' '
>  '
>
>  test_expect_success '--no-log disables shortlog' '
> -	echo "Merge branch ${apos}left${apos} into master" >expected &&
> +	echo "Merge branch ${apos}left${apos}" >expected &&
>  	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
>  	test_cmp expected actual
>  '
>
>  test_expect_success '--log=0 disables shortlog' '
> -	echo "Merge branch ${apos}left${apos} into master" >expected &&
> +	echo "Merge branch ${apos}left${apos}" >expected &&
>  	git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
>  	test_cmp expected actual
>  '
> @@ -300,7 +300,7 @@ test_expect_success 'fmt-merge-msg -m' '
>
>  test_expect_success 'setup: expected shortlog for two branches' '
>  	cat >expected <<-EOF
> -	Merge branches ${apos}left${apos} and ${apos}right${apos} into master
> +	Merge branches ${apos}left${apos} and ${apos}right${apos}
>
>  	# By Another Author (3) and A U Thor (2)
>  	# Via Another Committer
> @@ -397,7 +397,7 @@ test_expect_success 'merge-msg with nothing to merge' '
>
>  test_expect_success 'merge-msg tag' '
>  	cat >expected <<-EOF &&
> -	Merge tag ${apos}tag-r3${apos} into master
> +	Merge tag ${apos}tag-r3${apos}
>
>  	* tag ${apos}tag-r3${apos}:
>  	  Right #3
> @@ -418,7 +418,7 @@ test_expect_success 'merge-msg tag' '
>
>  test_expect_success 'merge-msg two tags' '
>  	cat >expected <<-EOF &&
> -	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos} into master
> +	Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
>
>  	* tag ${apos}tag-r3${apos}:
>  	  Right #3
> @@ -448,7 +448,7 @@ test_expect_success 'merge-msg two tags' '
>
>  test_expect_success 'merge-msg tag and branch' '
>  	cat >expected <<-EOF &&
> -	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos} into master
> +	Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
>
>  	* tag ${apos}tag-r3${apos}:
>  	  Right #3
> @@ -479,7 +479,7 @@ test_expect_success 'merge-msg tag and branch' '
>  test_expect_success 'merge-msg lots of commits' '
>  	{
>  		cat <<-EOF &&
> -		Merge branch ${apos}long${apos} into master
> +		Merge branch ${apos}long${apos}
>
>  		* long: (35 commits)
>  		EOF
> @@ -516,7 +516,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
>  	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
>  	{
>  		cat <<-\EOF
> -		Merge tag '\''annote'\'' into master
> +		Merge tag '\''annote'\''
>
>  		An annotated one
>
> @@ -531,7 +531,7 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
>  	git merge --no-commit --no-ff $annote &&
>  	{
>  		cat <<-EOF
> -		Merge tag '\''$annote'\'' into master
> +		Merge tag '\''$annote'\''
>
>  		An annotated one
>
> @@ -542,4 +542,24 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
>  	test_cmp expected .git/MERGE_MSG
>  '
>
> +test_expect_success 'merge.suppressDest configuration' '
> +	git checkout -B side master &&
> +	git commit --allow-empty -m "One step ahead" &&
> +	git checkout master &&
> +	git fetch . side &&
> +
> +	git -c merge.suppressDest="" fmt-merge-msg <.git/FETCH_HEAD >full.1 &&
> +	head -n1 full.1 >actual &&
> +	grep -e "Merge branch .side. into master" actual &&
> +
> +	git -c merge.suppressDest="mast" fmt-merge-msg <.git/FETCH_HEAD >full.2 &&
> +	head -n1 full.2 >actual &&
> +	grep -e "Merge branch .side. into master$" actual &&
> +
> +	git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
> +	head -n1 full.3 >actual &&
> +	grep -e "Merge branch .side." actual &&
> +	! grep -e " into master$" actual
> +'
> +
>  test_done
> diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> index 1d45f9a4ed..5883a6adc3 100755
> --- a/t/t7600-merge.sh
> +++ b/t/t7600-merge.sh
> @@ -14,9 +14,9 @@ Testing basic merge operations/option parsing.
>      ! [c4] c4
>       ! [c5] c5
>        ! [c6] c6
> -       * [master] Merge commit 'c1' into master
> +       * [master] Merge commit 'c1'
>  --------
> -       - [master] Merge commit 'c1' into master
> +       - [master] Merge commit 'c1'
>   +     * [c1] commit 1
>        +  [c6] c6
>       +   [c5] c5
> @@ -44,8 +44,8 @@ test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9
>  test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z
>
>  create_merge_msgs () {
> -	echo "Merge tag 'c2' into master" >msg.1-5 &&
> -	echo "Merge tags 'c2' and 'c3' into master" >msg.1-5-9 &&
> +	echo "Merge tag 'c2'" >msg.1-5 &&
> +	echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 &&
>  	{
>  		echo "Squashed commit of the following:" &&
>  		echo &&
> @@ -258,7 +258,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
>  	git commit --no-edit -a &&
>
>  	cat >expect <<-\EOF &&
> -	Merge tag '"'"'c7'"'"' into master
> +	Merge tag '"'"'c7'"'"'
>
>  	# ------------------------ >8 ------------------------
>  	# Do not modify or remove the line above.
> @@ -808,10 +808,10 @@ test_expect_success 'merge with conflicted --autostash changes' '
>  '
>
>  cat >expected.branch <<\EOF
> -Merge branch 'c5-branch' (early part) into master
> +Merge branch 'c5-branch' (early part)
>  EOF
>  cat >expected.tag <<\EOF
> -Merge commit 'c5~1' into master
> +Merge commit 'c5~1'
>  EOF
>
>  test_expect_success 'merge early part of c2' '
> diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
> index 2af33f195b..8e7e0a5865 100755
> --- a/t/t7608-merge-messages.sh
> +++ b/t/t7608-merge-messages.sh
> @@ -16,7 +16,7 @@ test_expect_success 'merge local branch' '
>  	git checkout master &&
>  	test_commit master-2 &&
>  	git merge local-branch &&
> -	check_oneline "Merge branch Qlocal-branchQ into master"
> +	check_oneline "Merge branch Qlocal-branchQ"
>  '
>
>  test_expect_success 'merge octopus branches' '
> @@ -26,7 +26,7 @@ test_expect_success 'merge octopus branches' '
>  	test_commit octopus-2 &&
>  	git checkout master &&
>  	git merge octopus-a octopus-b &&
> -	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ into master"
> +	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
>  '
>
>  test_expect_success 'merge tag' '
> @@ -35,7 +35,7 @@ test_expect_success 'merge tag' '
>  	git checkout master &&
>  	test_commit master-3 &&
>  	git merge tag-1 &&
> -	check_oneline "Merge tag Qtag-1Q into master"
> +	check_oneline "Merge tag Qtag-1Q"
>  '
>
>  test_expect_success 'ambiguous tag' '
> @@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' '
>  	git checkout master &&
>  	test_commit master-4 &&
>  	git merge ambiguous &&
> -	check_oneline "Merge tag QambiguousQ into master"
> +	check_oneline "Merge tag QambiguousQ"
>  '
>
>  test_expect_success 'remote-tracking branch' '
> @@ -54,7 +54,7 @@ test_expect_success 'remote-tracking branch' '
>  	git checkout master &&
>  	test_commit master-5 &&
>  	git merge origin/master &&
> -	check_oneline "Merge remote-tracking branch Qorigin/masterQ into master"
> +	check_oneline "Merge remote-tracking branch Qorigin/masterQ"
>  '
>
>  test_done
> --
> 2.28.0
>
>

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-08-10 11:53               ` Avoiding 'master' nomenclature Johannes Schindelin
@ 2020-08-10 15:45                 ` Junio C Hamano
  2020-08-11  2:39                   ` Johannes Schindelin
  0 siblings, 1 reply; 42+ messages in thread
From: Junio C Hamano @ 2020-08-10 15:45 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: Jeff King, Linus Torvalds, Git List Mailing

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Looks good to me, and apart from the config key (for which I also don't
> have a better suggestion), this looks pretty much how I would have done it
> (but refrained from doing because I really wanted the patch series to be
> part of v2.28.0).

Yes, my fault.  What you originally had was "we no longer special
case 'master', we special case init.default instead", and after I
responded with "why special case anything?  everybody is equal ;-)"
we ended up marking merges to 'master' as such in the latest
release.

The patch you are responding to is much more in line with the way in
which we dealt with the special casing of 'master' in the
fast-export anonymization in the latest release, and I am reasonably
happy with it.  Until we need to worry about the "do we need to keep
track of which branch is the 'primary' one in this repository
automatically?" issue sometime later, that is.

> TBH I expected some discussion along the line "Shouldn't this be an
> opt-in, with the initial default saying 'every branch except `master`'?",
> but that seems not to have taken place.

I do not quite get it.  Without any explicit configuration, every
branch except 'master' is shown, just like we've done for the past
15 years.  You can opt into hiding other names instead of 'master',
hiding nothing, or hiding everything.

Thanks.

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-08-10 15:45                 ` Junio C Hamano
@ 2020-08-11  2:39                   ` Johannes Schindelin
  2020-08-12  0:30                     ` Junio C Hamano
  0 siblings, 1 reply; 42+ messages in thread
From: Johannes Schindelin @ 2020-08-11  2:39 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Jeff King, Linus Torvalds, Git List Mailing

Hi Junio,

On Mon, 10 Aug 2020, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > TBH I expected some discussion along the line "Shouldn't this be an
> > opt-in, with the initial default saying 'every branch except
> > `master`'?", but that seems not to have taken place.
>
> I do not quite get it.  Without any explicit configuration, every branch
> except 'master' is shown, just like we've done for the past 15 years.
> You can opt into hiding other names instead of 'master', hiding nothing,
> or hiding everything.

Sorry for being unclear.

What I meant was: instead of a list of negative patterns, it might be more
desirable to have a positive list of patterns, with the option to exclude
some, much in the way `.gitignore` allows us to do. Something like this:

	[merge]
		mentionDestinationBranch = *
		mentionDestinationBranch = !master

i.e. a list that specifies which branch names we _do_ want to mention in
the merge commit's message, with possible exceptions.

However, this might be overkill, and a bit more complicated to implement,
as we now would also have to allow "negative" patterns. The most likely
avenue to this would be to use the `exclude_list` machinery, which would
be doubly confusing because we no longer would _exclude_ but _include_ a
set of branch names.

I am not sure that it makes sense to pursue this direction, but I wanted
to at least mention it lest we bump into limitations later that cannot be
fixed, by design.

What do you think?

Ciao,
Dscho

^ permalink raw reply	[flat|nested] 42+ messages in thread

* Re: Avoiding 'master' nomenclature
  2020-08-11  2:39                   ` Johannes Schindelin
@ 2020-08-12  0:30                     ` Junio C Hamano
  0 siblings, 0 replies; 42+ messages in thread
From: Junio C Hamano @ 2020-08-12  0:30 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: Jeff King, Linus Torvalds, Git List Mailing

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> However, this might be overkill, and a bit more complicated to implement,
> as we now would also have to allow "negative" patterns.

Somebody may want to teach negative patterns to merge.suppressDest,
so the implementation complexity in the end would not be all that
different in the end, when that future happens.  But until then, I
tend to agree with you that it may be simpler if the matched ones
are suppressed than mentioned (iow, the configuration variable,
merge.suppressDest, would be simpler to manage than your
hypothetical merge.mentionDest whose polarity is opposite).

That is primarily because I expect that the common usage patterns
are the following three:

 - mention destination of merges into any and all branches;

 - mention destination of no merges;

 - mention destination of merges into all branches except for the
   primary integration branch.

A configuration variable with either polarity would express the
first two equally well, but the last one (which is the primary use
case for continuity reasons) is easier to express with suppressDest.

With mentionDest, you'd need two entries, i.e. 'all', and 'not this
one', so you'd need a negative matching from the get-go.  So from
the point of view of end-user usability, not ease-of-implementation,
I think Peff picked the right polarity in his suggestion.

^ permalink raw reply	[flat|nested] 42+ messages in thread

end of thread, other threads:[~2020-08-12  0:30 UTC | newest]

Thread overview: 42+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29 19:44 Avoiding 'master' nomenclature Linus Torvalds
2020-07-29 20:04 ` Junio C Hamano
2020-07-29 20:23   ` Linus Torvalds
2020-07-29 20:38     ` Jonathan Nieder
2020-07-29 20:46       ` Linus Torvalds
2020-07-29 20:56         ` Linus Torvalds
2020-07-30  8:17       ` lego_12239
2020-07-31  0:57         ` Jeff King
2020-07-31  8:19           ` Oleg
2020-07-29 20:40     ` Linus Torvalds
2020-07-29 20:58       ` Jeff King
2020-07-29 21:20         ` Linus Torvalds
2020-07-30  0:29           ` Jeff King
2020-07-30  0:44             ` Linus Torvalds
2020-07-30  0:52               ` Jeff King
2020-07-30  0:57                 ` Linus Torvalds
2020-07-31  0:44                   ` Jeff King
2020-07-29 21:25         ` Junio C Hamano
2020-07-29 22:50           ` Junio C Hamano
2020-07-30  0:14             ` Jeff King
2020-07-30  0:23               ` Linus Torvalds
2020-07-30 10:11                 ` Michal Suchánek
2020-07-30  0:31               ` Jeff King
2020-07-30  0:36             ` Junio C Hamano
2020-07-30 18:02               ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Junio C Hamano
2020-07-30 18:02                 ` [PATCH v3 1/2] Revert "fmt-merge-msg: stop treating `master` specially" Junio C Hamano
2020-07-30 19:10                   ` Eric Sunshine
2020-07-30 19:40                     ` Junio C Hamano
2020-07-30 18:02                 ` [PATCH v3 2/2] fmt-merge-msg: allow merge destination to be omitted again Junio C Hamano
2020-07-31  0:42                 ` [PATCH v3 0/2] fmt-merge-msg: selectively suppress "into <branch>" Jeff King
2020-07-31  2:04                   ` Junio C Hamano
2020-07-31  2:22                     ` Jeff King
2020-07-31 20:03                       ` Taylor Blau
2020-07-31 20:12                         ` Junio C Hamano
2020-07-31 20:17                           ` Taylor Blau
2020-08-01  7:15                         ` Michal Suchánek
2020-08-10 11:53               ` Avoiding 'master' nomenclature Johannes Schindelin
2020-08-10 15:45                 ` Junio C Hamano
2020-08-11  2:39                   ` Johannes Schindelin
2020-08-12  0:30                     ` Junio C Hamano
2020-07-29 20:40     ` Junio C Hamano
2020-07-29 20:51       ` Linus Torvalds

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).