From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
Cc: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, don@goodman-wilson.com, stolee@gmail.com,
peff@peff.net, sandals@crustytoothpaste.net,
"Matt Rogers" <mattr94@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Taylor Blau" <me@ttaylorr.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Alban Gruin" <alban.gruin@gmail.com>,
"Johannes Sixt" <j6t@kdbg.org>,
"Denton Liu" <liu.denton@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Philippe Blain" <levraiphilippeblain@gmail.com>
Subject: Re: [PATCH v4 1/9] fmt-merge-msg: stop treating `master` specially
Date: Mon, 29 Jun 2020 15:27:44 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2006291520220.56@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200629162003.GD20303@danh.dev>
[-- Attachment #1: Type: text/plain, Size: 3300 bytes --]
Hi Danh,
On Mon, 29 Jun 2020, Đoàn Trần Công Danh wrote:
> On 2020-06-24 14:46:28+0000, Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > In the context of many projects renaming their primary branch names away
> > from `master`, Git wants to stop treating the `master` branch specially.
> >
> > Let's start with `git fmt-merge-msg`.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
>
> Hi Dscho,
>
> This change will also affect git-subtree test.
Good point. The patch looks good. I wonder whether we should also address
these:
Documentation/git-rebase.txt:* Merge branch 'report-a-bug'
Documentation/git-rebase.txt:* | Merge branch 'refactor-button'
Documentation/git-switch.txt:HEAD is now at 9fc9555312 Merge branch 'cc/shared-index-permbits'
Documentation/howto/using-signed-tag-in-pull-request.txt: Merge tag 'frotz-for-xyzzy' of example.com:/git/froboz.git/
Documentation/howto/using-signed-tag-in-pull-request.txt: Merge tag 'frotz-for-xyzzy' of example.com:/git/froboz.git/
t/t7606-merge-custom.sh:* (HEAD, master) Merge commit 'c3'
The first three matches are in manual pages, the next two in technical
documentation, and the last one in a comment in one of the test scripts.
So none of them are super critical, but maybe there are different
opinions?
Ciao,
Dscho
> We'll need this patch for subtree:
> ----------------8<-------------------
> From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
> <congdanhqx@gmail.com>
> Date: Mon, 29 Jun 2020 22:56:37 +0700
> Subject: [PATCH] contrib: subtree: adjust test to change in fmt-merge-msg
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> We're starting to stop treating `master' specially in fmt-merge-msg.
> Adjust the test to reflect that change.
>
> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
> ---
> contrib/subtree/t/t7900-subtree.sh | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
> index 57ff4b25c1..53d7accf94 100755
> --- a/contrib/subtree/t/t7900-subtree.sh
> +++ b/contrib/subtree/t/t7900-subtree.sh
> @@ -196,7 +196,8 @@ 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)'\''"
> + check_equal "$(last_commit_message)" \
> + "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
> )
> '
>
> @@ -273,7 +274,8 @@ 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)'\''"
> + check_equal "$(last_commit_message)" \
> + "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
> )
> '
>
> --
> 2.27.0.111.gc72c7da667
> Danh
>
next prev parent reply other threads:[~2020-06-30 13:17 UTC|newest]
Thread overview: 180+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 21:19 [PATCH 0/9] Allow overriding the default name of the default branch Johannes Schindelin via GitGitGadget
2020-06-10 21:19 ` [PATCH 1/9] init: allow overriding the default branch name for new repositories Don Goodman-Wilson via GitGitGadget
2020-06-10 23:22 ` brian m. carlson
2020-06-11 0:16 ` Eric Sunshine
2020-06-11 14:09 ` Johannes Schindelin
2020-06-11 15:28 ` Junio C Hamano
2020-06-16 12:45 ` Jeff King
2020-06-16 12:47 ` Jeff King
2020-06-18 13:08 ` Johannes Schindelin
2020-06-23 20:32 ` Johannes Schindelin
2020-06-11 9:35 ` Phillip Wood
2020-06-12 11:55 ` Johannes Schindelin
2020-06-12 16:51 ` Junio C Hamano
2020-06-14 22:00 ` Johannes Schindelin
2020-06-15 10:00 ` Phillip Wood
2020-06-11 10:23 ` Alban Gruin
2020-06-11 23:14 ` Junio C Hamano
2020-06-11 23:46 ` brian m. carlson
2020-06-12 12:45 ` Johannes Schindelin
2020-06-13 18:01 ` Alban Gruin
2020-06-14 8:57 ` Johannes Schindelin
2020-06-16 12:25 ` Jeff King
2020-06-18 10:17 ` Johannes Schindelin
2020-06-10 21:19 ` [PATCH 2/9] remote: respect `core.defaultBranchName` Johannes Schindelin via GitGitGadget
2020-06-16 12:35 ` Jeff King
2020-06-18 10:21 ` Johannes Schindelin
2020-06-18 11:50 ` Jeff King
2020-06-23 21:15 ` Johannes Schindelin
2020-06-10 21:19 ` [PATCH 3/9] send-pack/transport-helper: " Johannes Schindelin via GitGitGadget
2020-06-10 21:19 ` [PATCH 4/9] testsvn: " Johannes Schindelin via GitGitGadget
2020-06-10 21:19 ` [PATCH 5/9] submodule: use the (possibly overridden) default branch name Johannes Schindelin via GitGitGadget
2020-06-15 10:46 ` Denton Liu
2020-06-10 21:19 ` [PATCH 6/9] clone: learn about the possibly-configured " Johannes Schindelin via GitGitGadget
2020-06-10 22:58 ` Junio C Hamano
2020-06-10 21:19 ` [PATCH 7/9] fmt-merge-msg: " Johannes Schindelin via GitGitGadget
2020-06-10 22:59 ` Junio C Hamano
2020-06-10 21:19 ` [PATCH 8/9] fast-export: respect the possibly-overridden " Johannes Schindelin via GitGitGadget
2020-06-10 21:54 ` Matt Rogers
2020-06-10 23:25 ` Junio C Hamano
2020-06-10 23:39 ` brian m. carlson
2020-06-11 0:20 ` Matt Rogers
2020-06-11 5:26 ` Junio C Hamano
2020-06-11 14:05 ` Johannes Schindelin
2020-06-11 15:05 ` Re* " Junio C Hamano
2020-06-11 16:44 ` Junio C Hamano
2020-06-11 18:18 ` Junio C Hamano
2020-06-12 12:07 ` Johannes Schindelin
2020-06-12 12:32 ` Junio C Hamano
2020-06-12 12:03 ` Johannes Schindelin
2020-06-12 12:50 ` Junio C Hamano
2020-06-12 12:53 ` Johannes Schindelin
2020-06-12 13:18 ` Johannes Schindelin
2020-06-12 15:19 ` Junio C Hamano
2020-06-12 15:22 ` Junio C Hamano
2020-06-13 5:00 ` Johannes Schindelin
2020-06-12 15:14 ` Junio C Hamano
2020-06-13 11:49 ` Johannes Sixt
2020-06-13 16:25 ` Junio C Hamano
2020-06-13 14:47 ` Johannes Schindelin
2020-06-13 18:49 ` Junio C Hamano
2020-06-14 8:55 ` Johannes Schindelin
2020-06-17 20:06 ` Junio C Hamano
2020-06-23 21:11 ` Johannes Schindelin
2020-06-23 21:32 ` Junio C Hamano
2020-06-13 14:44 ` Johannes Schindelin
2020-06-11 13:57 ` Johannes Schindelin
2020-06-11 18:19 ` Junio C Hamano
2020-06-12 12:07 ` Johannes Schindelin
2020-06-10 21:19 ` [PATCH 9/9] Document how the default branch name can be overridden Johannes Schindelin via GitGitGadget
2020-06-11 0:18 ` Junio C Hamano
2020-06-10 23:11 ` [PATCH 0/9] Allow overriding the default name of the default branch Junio C Hamano
2020-06-11 5:42 ` Junio C Hamano
2020-06-11 13:44 ` Johannes Schindelin
2020-06-11 14:44 ` Junio C Hamano
2020-06-10 23:41 ` brian m. carlson
2020-06-11 1:07 ` Taylor Blau
2020-06-11 14:33 ` Johannes Schindelin
2020-06-15 10:03 ` Pratyush Yadav
2020-06-14 22:26 ` Johannes Schindelin
2020-06-16 0:19 ` Denton Liu
2020-06-23 20:10 ` Johannes Schindelin
2020-06-15 23:10 ` brian m. carlson
2020-06-15 12:50 ` [PATCH v2 00/12] " Johannes Schindelin via GitGitGadget
2020-06-15 12:50 ` [PATCH v2 01/12] fast-export: do anonymize the primary branch name Junio C Hamano via GitGitGadget
2020-06-16 12:58 ` Jeff King
2020-06-17 18:16 ` Junio C Hamano
2020-06-17 21:23 ` Jeff King
2020-06-18 2:06 ` Elijah Newren
2020-06-18 6:30 ` Junio C Hamano
2020-06-18 7:13 ` Elijah Newren
2020-06-18 11:45 ` Jeff King
2020-06-15 12:50 ` [PATCH v2 02/12] fmt-merge-msg: introduce a way to override the main " Johannes Schindelin via GitGitGadget
2020-06-15 15:00 ` Phillip Wood
2020-06-23 12:31 ` Johannes Schindelin
2020-06-15 17:05 ` Junio C Hamano
2020-06-23 19:19 ` Johannes Schindelin
2020-06-16 8:46 ` Ævar Arnfjörð Bjarmason
2020-06-17 18:21 ` Junio C Hamano
2020-06-16 13:04 ` Jeff King
2020-06-17 18:23 ` Junio C Hamano
2020-06-18 13:15 ` Johannes Schindelin
2020-06-17 20:56 ` Johannes Sixt
2020-06-17 21:16 ` Junio C Hamano
2020-06-23 21:12 ` Johannes Schindelin
2020-06-15 12:50 ` [PATCH v2 03/12] send-pack/transport-helper: respect `core.mainBranch` Johannes Schindelin via GitGitGadget
2020-06-15 12:50 ` [PATCH v2 04/12] git_main_branch_name(): optionally report the full ref name Johannes Schindelin via GitGitGadget
2020-06-15 15:04 ` Phillip Wood
2020-06-23 19:17 ` Johannes Schindelin
2020-06-15 12:50 ` [PATCH v2 05/12] fast-export: handle overridden main branch names correctly Johannes Schindelin via GitGitGadget
2020-06-15 15:05 ` Phillip Wood
2020-06-16 13:10 ` Jeff King
2020-06-16 15:49 ` Phillip Wood
2020-06-18 10:08 ` Johannes Schindelin
2020-06-15 17:09 ` Junio C Hamano
2020-06-23 19:22 ` Johannes Schindelin
2020-06-15 12:50 ` [PATCH v2 06/12] branch -m: adjust `core.mainBranch` if necessary Johannes Schindelin via GitGitGadget
2020-06-15 12:50 ` [PATCH v2 07/12] init: allow specifying the main branch name for the new repository Johannes Schindelin via GitGitGadget
2020-06-15 12:50 ` [PATCH v2 08/12] init: allow overriding the default main branch name via the config Don Goodman-Wilson via GitGitGadget
2020-06-15 12:50 ` [PATCH v2 09/12] clone: handle overridden main branch names Johannes Schindelin via GitGitGadget
2020-06-16 13:22 ` Jeff King
2020-06-23 20:58 ` Johannes Schindelin
2020-06-15 12:50 ` [PATCH v2 10/12] remote: learn about the possibly-overridden default main branch name Johannes Schindelin via GitGitGadget
2020-06-15 12:50 ` [PATCH v2 11/12] submodule: use the correct default for the " Johannes Schindelin via GitGitGadget
2020-06-16 13:46 ` Jeff King
2020-06-23 21:03 ` Johannes Schindelin
2020-06-23 21:14 ` Jeff King
2020-06-15 12:50 ` [PATCH v2 12/12] testsvn: respect `init.defaultBranch` Johannes Schindelin via GitGitGadget
2020-06-16 13:51 ` Jeff King
2020-06-23 21:07 ` Johannes Schindelin
2020-06-23 22:33 ` [PATCH v3 0/8] Allow overriding the default name of the default branch Johannes Schindelin via GitGitGadget
2020-06-23 22:33 ` [PATCH v3 1/8] fmt-merge-msg: stop treating `master` specially Johannes Schindelin via GitGitGadget
2020-06-24 16:16 ` Junio C Hamano
2020-06-25 13:07 ` Johannes Schindelin
2020-06-23 22:33 ` [PATCH v3 2/8] send-pack/transport-helper: avoid mentioning a particular branch Johannes Schindelin via GitGitGadget
2020-06-24 0:36 ` Junio C Hamano
2020-06-24 12:44 ` Johannes Schindelin
2020-06-24 15:44 ` Junio C Hamano
2020-06-25 13:05 ` Johannes Schindelin
2020-06-23 22:33 ` [PATCH v3 3/8] submodule: use a better fall-back for missing remote.<name>.branch Johannes Schindelin via GitGitGadget
2020-06-24 2:18 ` Philippe Blain
2020-06-24 12:51 ` Johannes Schindelin
2020-06-23 22:33 ` [PATCH v3 4/8] init: allow specifying the initial branch name for the new repository Johannes Schindelin via GitGitGadget
2020-06-24 0:58 ` Junio C Hamano
2020-06-24 12:55 ` Johannes Schindelin
2020-06-23 22:33 ` [PATCH v3 5/8] init: allow setting the default for the initial branch name via the config Don Goodman-Wilson via GitGitGadget
2020-06-24 1:05 ` Junio C Hamano
2020-06-24 12:56 ` Johannes Schindelin
2020-06-24 16:25 ` Junio C Hamano
2020-06-23 22:33 ` [PATCH v3 6/8] clone: use configured default branch name when appropriate Johannes Schindelin via GitGitGadget
2020-06-23 22:33 ` [PATCH v3 7/8] remote: use the " Johannes Schindelin via GitGitGadget
2020-06-24 1:10 ` Junio C Hamano
2020-06-24 13:00 ` Johannes Schindelin
2020-06-23 22:33 ` [PATCH v3 8/8] testsvn: respect `init.defaultBranch` Johannes Schindelin via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 0/9] Allow overriding the default name of the default branch Johannes Schindelin via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 1/9] fmt-merge-msg: stop treating `master` specially Johannes Schindelin via GitGitGadget
2020-06-29 16:20 ` Đoàn Trần Công Danh
2020-06-29 13:27 ` Johannes Schindelin [this message]
2020-06-30 15:05 ` Đoàn Trần Công Danh
2020-07-01 10:39 ` Johannes Schindelin
2020-07-01 19:54 ` Junio C Hamano
2020-06-24 14:46 ` [PATCH v4 2/9] send-pack/transport-helper: avoid mentioning a particular branch Johannes Schindelin via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 3/9] submodule: fall back to remote's HEAD for missing remote.<name>.branch Johannes Schindelin via GitGitGadget
2020-06-24 16:17 ` Junio C Hamano
2020-06-24 14:46 ` [PATCH v4 4/9] docs: add missing diamond brackets Johannes Schindelin via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 5/9] init: allow specifying the initial branch name for the new repository Johannes Schindelin via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 6/9] init: allow setting the default for the initial branch name via the config Don Goodman-Wilson via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 7/9] clone: use configured default branch name when appropriate Johannes Schindelin via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 8/9] remote: use the " Johannes Schindelin via GitGitGadget
2020-06-24 14:46 ` [PATCH v4 9/9] testsvn: respect `init.defaultBranch` Johannes Schindelin via GitGitGadget
2020-06-24 16:26 ` [PATCH v4 0/9] Allow overriding the default name of the default branch Junio C Hamano
2020-06-25 13:03 ` Johannes Schindelin
2020-06-29 22:41 ` brian m. carlson
2020-07-12 13:03 ` Edward Thomson
2020-07-12 8:19 ` Johannes Schindelin
[not found] ` <CA+WKDT1GMNTY5N862-7ui70D6-b1u6fuUkvctEYo+57aJGbjmw@mail.gmail.com>
2020-07-14 14:55 ` Johannes Schindelin
2020-06-16 9:47 ` [PATCH " Ævar Arnfjörð Bjarmason
2020-06-16 14:09 ` Jeff King
2020-06-16 14:24 ` Jeff King
2020-06-23 20:28 ` Johannes Schindelin
2020-06-17 20:28 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2006291520220.56@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=avarab@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=don@goodman-wilson.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=j6t@kdbg.org \
--cc=levraiphilippeblain@gmail.com \
--cc=liu.denton@gmail.com \
--cc=mattr94@gmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=phillip.wood123@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).