From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Subject: Re: [PATCH] t4013: prepare for the new default branch name "main"
Date: Thu, 12 Nov 2020 14:48:36 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2011121443100.18437@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqsg9f36nu.fsf@gitster.c.googlers.com>
Hi Junio,
On Wed, 11 Nov 2020, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Could you advise how I could help advance this patch further? This is the
> > last patch I need that is not in `next` to get to the patch series that
> > actually flips the default of `init.defaultBranch` to `main` (see
> > https://github.com/gitgitgadget/git/pull/762).
>
> Is it an option to add
>
> git config --global init.defaultBranchName master
>
> at the very beginning of the test script without making any other
> change?
Unfortunately not because at that stage, `HOME` is still not overridden.
It will be overridden in `test-lib.sh`. Which is also where the initial
repository (and hence, the initial branch) will be created.
So: the suggested command with work neither before `. test-lib.sh` nor
after it.
I understand the desire to leave t4013 alone for the moment. If that's
what you want, I can send off a patch series that _specificall_ excludes
t4013, and will the follow up with a pair of patches that ties up that
loose end.
Sound good?
> After all, we may want to avoid 'slave' but 'master' by itself is
> not all that bad, especially given that it is used only in the test
> script. If we were to have "does the configuration variable work
> OK?" test somewhere anyway, why not make it this test?
What's wrong with the test cases in t0001-init.sh that are labeled
'overridden default initial branch name (config)', 'overridden default
main branch name (env)' and 'invalid default branch name', i.e.
https://github.com/git/git/blob/e31aba42fb/t/t0001-init.sh#L554-L572?
Thanks,
Dscho
next prev parent reply other threads:[~2020-11-12 13:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 9:59 [PATCH] t4013: prepare for the new default branch name "main" Johannes Schindelin via GitGitGadget
2020-11-11 21:43 ` Johannes Schindelin
2020-11-11 21:49 ` Junio C Hamano
2020-11-12 13:48 ` Johannes Schindelin [this message]
2020-11-12 16:50 ` 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.2011121443100.18437@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).