From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 0/5] Inclusive naming, part II
Date: Wed, 16 Sep 2020 18:10:48 +0000 [thread overview]
Message-ID: <pull.734.git.1600279853.gitgitgadget@gmail.com> (raw)
This patch series represents the logical next step on the journey begun with
introducing init.defaultBranch: in these patches, we avoid a couple
unnecessary mentions of the branch name "master".
This patch series does not try to change the default branch name, although I
have that patch series ready to go. You can see the overall idea here:
https://github.com/gitgitgadget/git/pull/655. Concretely, I plan on
submitting three more patch series after this one:
1. a relatively small patch series to avoid using the branch name main in
the test suite. This is necessary because my plan is to change the
default branch name to that name, therefore it cannot be used as the
name of a topic branch any longer.
2. a relatively large patch series (currently consisting of 18 patches) to
change the default branch name to main. Most of the patches provide
non-trivial (read: non-scriptable) adjustments to the test suite in an
incremental fashion, with a big patch toward the end that reflects a
fully-automated search-and-replace of all the trivial cases.
3. a very small patch series with fall-out patches that are not necessary
to pass the test suite, but are still required to complete the rename
(adjusted code comment, file rename).
(Note: I am still debating whether I should move one or two patches from the
second to the third patch series)
Johannes Schindelin (5):
fast-export: avoid using unnecessary language in a code comment
t/test-terminal: avoid non-inclusive language
t3200: avoid variations of the `master` branch name
tests: avoid variations of the `master` branch name
t9902: avoid using the branch name `master`
builtin/fast-export.c | 2 +-
t/t3200-branch.sh | 34 ++++++++++++++---------------
t/t3427-rebase-subtree.sh | 42 ++++++++++++++++++------------------
t/t4150-am.sh | 8 +++----
t/t5515-fetch-merge-logic.sh | 6 +++---
t/t5523-push-upstream.sh | 20 ++++++++---------
t/t6018-rev-list-glob.sh | 6 +++---
t/t6040-tracking-info.sh | 20 ++++++++---------
t/t6409-merge-subtree.sh | 14 ++++++------
t/t9902-completion.sh | 10 ++++-----
t/test-terminal.perl | 32 +++++++++++++--------------
11 files changed, 97 insertions(+), 97 deletions(-)
base-commit: 54e85e7af1ac9e9a92888060d6811ae767fea1bc
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-734%2Fdscho%2Favoid-unnecessary-branch-name-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-734/dscho/avoid-unnecessary-branch-name-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/734
--
gitgitgadget
next reply other threads:[~2020-09-16 18:12 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 18:10 Johannes Schindelin via GitGitGadget [this message]
2020-09-16 18:10 ` [PATCH 1/5] fast-export: avoid using unnecessary language in a code comment Johannes Schindelin via GitGitGadget
2020-09-16 21:05 ` Junio C Hamano
2020-09-16 18:10 ` [PATCH 2/5] t/test-terminal: avoid non-inclusive language Johannes Schindelin via GitGitGadget
2020-09-16 21:05 ` Junio C Hamano
2020-09-16 21:25 ` Junio C Hamano
2020-09-20 15:34 ` Johannes Schindelin
2020-09-21 21:12 ` Junio C Hamano
2020-09-16 18:10 ` [PATCH 3/5] t3200: avoid variations of the `master` branch name Johannes Schindelin via GitGitGadget
2020-09-16 21:11 ` Jeff King
2020-09-16 22:28 ` Junio C Hamano
2020-09-16 22:39 ` Jeff King
2020-09-20 15:43 ` Johannes Schindelin
2020-09-21 21:26 ` Junio C Hamano
2020-09-16 18:10 ` [PATCH 4/5] tests: " Johannes Schindelin via GitGitGadget
2020-09-16 18:10 ` [PATCH 5/5] t9902: avoid using the branch name `master` Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 0/5] Inclusive naming, part II Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 1/5] fast-export: avoid using unnecessary language in a code comment Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 2/5] t/test-terminal: avoid non-inclusive language Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 3/5] t3200: avoid variations of the `master` branch name Johannes Schindelin via GitGitGadget
2020-09-21 22:01 ` [PATCH v2 4/5] tests: " Johannes Schindelin via GitGitGadget
2020-09-21 22:31 ` Junio C Hamano
2020-09-26 4:20 ` Johannes Schindelin
2020-09-21 22:01 ` [PATCH v2 5/5] t9902: avoid using the branch name `master` Johannes Schindelin via GitGitGadget
2020-09-21 22:35 ` Junio C Hamano
2020-09-26 4:25 ` Johannes Schindelin
2020-09-21 22:24 ` [PATCH v2 0/5] Inclusive naming, part II Jeff King
2020-09-26 4:29 ` Johannes Schindelin
2020-09-27 8:45 ` Jeff King
2020-09-26 21:04 ` [PATCH v3 " Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 1/5] fast-export: avoid using unnecessary language in a code comment Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 2/5] t/test-terminal: avoid non-inclusive language Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 3/5] t3200: avoid variations of the `master` branch name Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 4/5] tests: " Johannes Schindelin via GitGitGadget
2020-09-26 21:04 ` [PATCH v3 5/5] t9902: avoid using the branch name `master` Johannes Schindelin via GitGitGadget
2020-09-30 22:21 ` [PATCH v3 0/5] Inclusive naming, part II Junio C Hamano
2020-09-30 22:34 ` Jeff King
2020-09-30 22:57 ` 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
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=pull.734.git.1600279853.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/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).