Skip to content

Inclusive naming: the long game #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 189 commits into
base: next
Choose a base branch
from
Open

Inclusive naming: the long game #655

wants to merge 189 commits into from

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 10, 2020 •
edited
Loading

This PR is based on the initial idea of #653, but offers substantial improvements (amounting to a complete rewrite).

The idea is to split out several PRs from this:

@gitgitgadget
Copy link

gitgitgadget bot commented Jun 10, 2020

The pull request has 31 commits. The max allowed is 30. Please split the patch series into multiple pull requests. Also consider squashing related commits.

@dscho dscho mentioned this pull request Jun 10, 2020
Closed
@dscho dscho force-pushed the inclusive-naming branch from 8f0863a to 0c7511d Compare June 10, 2020 18:43
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 10, 2020

The pull request has 34 commits. The max allowed is 30. Please split the patch series into multiple pull requests. Also consider squashing related commits.

@dscho dscho force-pushed the inclusive-naming branch 2 times, most recently from 8c18f9a to 28f007f Compare June 10, 2020 23:54
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 10, 2020

There is an issue in commit dbf118ff9974010a7d476609abfcae28223994c7:
Commit checks stopped - the message is too short

@dscho dscho force-pushed the inclusive-naming branch 2 times, most recently from 2e2f26f to b40fc5a Compare June 12, 2020 14:58
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 12, 2020

The pull request has 114 commits. The max allowed is 30. Please split the patch series into multiple pull requests. Also consider squashing related commits.

@dscho dscho force-pushed the inclusive-naming branch from b40fc5a to b184e47 Compare June 12, 2020 15:02
@gitgitgadget
Copy link

gitgitgadget bot commented Jun 12, 2020

The pull request has 115 commits. The max allowed is 30. Please split the patch series into multiple pull requests. Also consider squashing related commits.

@dscho dscho mentioned this pull request Jun 12, 2020
Closed
@dscho dscho force-pushed the inclusive-naming branch 4 times, most recently from a293fd7 to 674ac49 Compare June 14, 2020 23:36
@dscho dscho mentioned this pull request Jun 15, 2020
Closed
@dscho dscho force-pushed the inclusive-naming branch 2 times, most recently from 071c381 to 456587b Compare June 15, 2020 00:12
This was referenced Jun 15, 2020
Closed
Closed
@UncannyBingo
Copy link

UncannyBingo commented Jun 15, 2020 •
edited
Loading

UncannyBingo
UncannyBingo reviewed Jun 15, 2020
View reviewed changes
@UncannyBingo UncannyBingo mentioned this pull request Jun 15, 2020
Closed
@UncannyBingo
Copy link

Putting this down for the moment. Here is a list of files that have changed, but have not yet made it into a split-off PR:

  • compat/vcbuild/README
  • git-cvsimport.perl
  • git-gui/README.md
  • git-gui/git-gui.sh
  • git-gui/lib/choose_repository.tcl
  • git-gui/lib/spellcheck.tcl
  • git-gui/po/README
  • git-gui/po/bg.po
  • git-gui/po/de.po
  • git-gui/po/el.po
  • git-gui/po/fr.po
  • git-gui/po/git-gui.pot
  • git-gui/po/glossary/bg.po
  • git-gui/po/glossary/de.po
  • git-gui/po/glossary/git-gui-glossary.pot
  • git-gui/po/glossary/pt_pt.po
  • git-gui/po/hu.po
  • git-gui/po/it.po
  • git-gui/po/ja.po
  • git-gui/po/nb.po
  • git-gui/po/pt_br.po
  • git-gui/po/pt_pt.po
  • git-gui/po/ru.po
  • git-gui/po/sv.po
  • git-gui/po/vi.po
  • git-gui/po/zh_cn.po
  • git-p4.py
  • gitk-git/gitk
  • gitk-git/po/bg.po
  • gitweb/gitweb.perl
  • perl/Git.pm
  • po/bg.po
  • po/ca.po
  • po/de.po
  • po/el.po
  • po/es.po
  • po/fr.po
  • po/git.pot
  • po/it.po
  • po/ko.po
  • po/pt_PT.po
  • po/ru.po
  • po/sv.po
  • po/tr.po
  • po/vi.po
  • po/zh_CN.po
  • po/zh_TW.po
  • templates/hooks--pre-rebase.sample

AnnaSkawinska
AnnaSkawinska reviewed Jun 16, 2020
View reviewed changes
Documentation/Makefile Outdated
@@ -49,7 +49,7 @@ endif

MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
GIT_MAN_REF = master
GIT_MAN_REF = main

This comment was marked as off-topic.

Sign in to view

@dscho
Copy link
Member Author

dscho commented Jun 16, 2020

  • a patch series that handles the hard parts in the test suite (such as t5515)

I would recommend to split out one patch series at a time, when the previous patch series stabilized on the Git mailing list.

Right now, for example, #656 saw its second iteration sent to the Git mailing list, there are still a couple of valid suggestions outstanding, so it is kind of stabilizing, but Junio has only picked up v1 as js/default-branch-name so far. Therefore, I would like to hold off with splitting out the next set of patches until two things happened:

  1. v2 (or even v3) have been picked up upstream, and we can rebase on top of the upstream branch
  2. we split the big commits. In particular, I want to split out the sedable parts (moving the more complicated changes before them). Without that split, we won't have a good idea where the natural boundaries are between the patch series we want to contribute on top of js/default-branch-name.

klausenbusk
klausenbusk reviewed Jun 22, 2020
View reviewed changes
@dscho dscho force-pushed the inclusive-naming branch from 456587b to 994137d Compare June 25, 2020 20:55
dscho added 12 commits November 14, 2020 00:07
@dscho
Adjust some code comments to the new default branch name
eeddbab 
Since we use `main` by default now, a couple of code comments need to be
modified to reflect that change.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
git-gui: adjust for the changed default branch name
ea3a81a 
Git just changed the default of `init.defaultBranch` to `main`,
therefore we should modify Git GUI accordingly.

Note that there are more matches for the needle `master`:

- git-gui's very own repository has not changed the name of its primary
  branch.

- aspell calls its base dictionary "master dictionary".

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
gitk: include main in the visible refs by default
6d19546 
In case there are too many refs, we choose to display only a subset,
making sure that important ones are included.

Now that the default branch name has been changed to `main`, that would
make branches named `main` important in this context.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
cvsimport: use the new default branch name main
da7fa84 
As we changed the default of `init.defaultBranch` to `main`, we might
just as well also use that default in `cvsimport`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
WIP docs/git-p4: use main as default branch name
067029a 
TODO: should we touch this at all? Or is the branch name inherited from
Perforce?

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
gitweb: treat main as a branch name commonly used for primary branches
54877ea 
The part touched by this patch wants to remove uninteresting parts of
commit messages, e.g. `Automatic merge of master`. Let's handle the
branch name `main` as "uninteresting" in this context, because it has
become the default branch name used by `git init`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'use-main-as-default-branch-name-extra'
0846ba3 
Some "mopping up" after the default branch name was changed. None of
these should be user-facing.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'git-gui/use-main-as-default-branch-name'
91d7a8d 
This patch needs to be sent to the Git GUI project separately.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'gitk/use-main-as-default-branch-name'
0ad5d36 
This patch needs to be sent to the `gitk` project individually.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'cvsimport-use-main-as-default-branch-name'
ea2dc01 
This adjusts the `git cvsimport` command to reflect the new default
branch name.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'p4-use-main-as-default-branch-name'
b87892c 
This adjusts the `git cvsimport` command to reflect the new default
branch name.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Merge branch 'gitweb-use-main-as-default-branch-name'
36305c8 
This adjusts gitweb to reflect the new default branch name.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@gitgitgadget
Copy link

gitgitgadget bot commented Nov 13, 2020

The pull request has 80 commits. The max allowed is 30. Please split the patch series into multiple pull requests. Also consider squashing related commits.

@gitgitgadget
Copy link

gitgitgadget bot commented Nov 13, 2020

There are merge commits in this Pull Request:

2dbf2ce122ba765796004b8b460f91a716d478bc
e3ab0a0000b7788ffb4442433b17070358b1c99f
ee20cb60e81ce84f0d965af75126251a85717535
7b110c9c2f5c7b6c1ae2eaccbb0a8527429cba8d
f4c028a8e4d7a2334096a047728fc00e286a8623
2fd313246bab014b7ada7bc1453414c74f2988c2
3c2d111964d18fc2f9174fe5818bcfc72b0d4f18

Please rebase the branch and force-push.

@dscho dscho force-pushed the next branch 2 times, most recently from d98b1dd to 37b22c6 Compare October 28, 2022 19:31
@dscho dscho force-pushed the next branch 2 times, most recently from 15d354c to 377b9f9 Compare June 16, 2023 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@UncannyBingo UncannyBingo UncannyBingo left review comments

@derrickstolee derrickstolee derrickstolee left review comments

@AnnaSkawinska AnnaSkawinska AnnaSkawinska left review comments

@klausenbusk klausenbusk klausenbusk left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@dscho @UncannyBingo @derrickstolee @AnnaSkawinska @klausenbusk @matheustavares @jrn @peff @gitster