From: Derrick Stolee <stolee@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jonathan Nieder <jrnieder@gmail.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 2/2] tests: avoid using the branch name `main`
Date: Thu, 8 Oct 2020 14:15:41 -0400 [thread overview]
Message-ID: <4d093b96-cdb3-e71a-c669-ee54fbd58ab7@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2010080957100.50@tvgsbejvaqbjf.bet>
On 10/8/2020 4:05 AM, Johannes Schindelin wrote:
> On Mon, 5 Oct 2020, Jonathan Nieder wrote:
>> Johannes Schindelin wrote:
>>> - git switch -c main &&
>>> + git switch -c primary &&
>>
>> Is there a secondary corresponding to this primary?
>
> Nope, of course not ;-)
>
>> I guess the idea is that this is the trunk that other branches branch
>> from? Looking at the history, it seems that this test was added
>> relatively recently and it may have had the upcoming branch name change
>> in mind (or in other words if it were an older test it might be expected
>> to use "master").
>
> I guess that Stolee (Cc:ed) had something like that in mind.
>
> When I look at 8d049e182e2 (revision: --show-pulls adds helpful
> merges, 2020-04-10), I get the impression that does not _really_ care
> about the name of the main branch, it just wants to know the name so it
> can switch back and forth.
The branch name here is not important, so please replace it
with whatever works best for you.
What _is_ important is keeping the commit messages in agreement with
the commented ASCII-art DAG above this test. It does not mention the
branch names, so this change will not cause an inconsistent comment.
Thanks,
-Stolee
next prev parent reply other threads:[~2020-10-08 18:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 8:56 [PATCH 0/2] Avoid main as branch name in the test suite Johannes Schindelin via GitGitGadget
2020-10-05 8:56 ` [PATCH 1/2] t1415: avoid using `main` as ref name Johannes Schindelin via GitGitGadget
2020-10-05 9:54 ` Jonathan Nieder
2020-10-08 7:56 ` Johannes Schindelin
2020-10-05 8:56 ` [PATCH 2/2] tests: avoid using the branch name `main` Johannes Schindelin via GitGitGadget
2020-10-05 9:59 ` Jonathan Nieder
2020-10-08 8:05 ` Johannes Schindelin
2020-10-08 18:15 ` Derrick Stolee [this message]
2020-10-08 10:13 ` [PATCH v2 0/2] Avoid main as branch name in the test suite Johannes Schindelin via GitGitGadget
2020-10-08 10:13 ` [PATCH v2 1/2] t1415: avoid using `main` as ref name Johannes Schindelin via GitGitGadget
2020-10-08 10:13 ` [PATCH v2 2/2] tests: avoid using the branch name `main` Johannes Schindelin via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4d093b96-cdb3-e71a-c669-ee54fbd58ab7@gmail.com \
--to=stolee@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jrnieder@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).