Inclusive naming: the long game

[dscho]

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:

• Inclusive naming: the long game #655 (init.defaultBranch)

• Inclusive naming, part II #734 (avoid-unnecessary-branch-name)

• po: adjust for the recent change in send-pack/transport-helper #742 (adjust-send-pack-translation) (the i18n maintainer wants to do this differently).

• Avoid main as branch name in the test suite #743 (avoid-main-as-branch-name-in-tests)

• Prepare for changing the default branch name main (last manual part) #758 (use-main-as-default-branch-name-manual)

• Adjust t5411 for the upcoming change of the default branch name #760 (use-main-as-default-branch-name-t5411)

• tests: consolidate the file_size function into test-lib-functions.sh #780 (file_size-test-function)

• p4: respect init.defaultBranch #782 (git-p4-and-init.defaultBranch)

• (Mostly whitespace) cleanups in preparation for renaming the default main branch #784 (main-branch-preliminary-cleanups)

• Adjust t5515 for the upcoming change of the default branch name #761 (use-main-as-default-branch-name-t5515)

• tests: use main as default branch name #762 (use-main-as-default-branch-name)

• t4013: prepare for the new default branch name "main" #783 (prepare-for-main-branch-t4013)

• use-main-as-default-branch-name-docs

• use-main-as-default-branch-name-extra

• git-gui/use-main-as-default-branch-name

• gitk/use-main-as-default-branch-name

• cvsimport-use-main-as-default-branch-name

• p4-use-main-as-default-branch-name

• gitweb-use-main-as-default-branch-name

[gitgitgadget]

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.

[gitgitgadget]

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.

[gitgitgadget]

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

[gitgitgadget]

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.

[gitgitgadget]

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.

[UncannyBingo]

• a patch series that handles the hard parts in the test suite (such as t5515)
• a patch series that handles more mindless adjustments (sed invocations) in the test suite (At the moment all tests are in Moving tests from dscho/git:inclusive-naming #663 need help identifying how to sort them into hard and mindless)
• a patch to actually flip the switch, making main the default branch name Flipping the switch! #662
• a patch series to handle contrib/ Moving documentation changes from dscho/git:inclusive-naming. #660
• a patch series to handle code comments (for now, part of Flipping the switch! #662)
• one or more patch series to handle the1 documentation Moving Contrib changes from dscho/git:inclusive-naming #661 (it's a singleton, see what you think)

[UncannyBingo]

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

[dscho]

• 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.

[gitgitgadget]

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]

There are merge commits in this Pull Request:

2dbf2ce122ba765796004b8b460f91a716d478bc
e3ab0a0000b7788ffb4442433b17070358b1c99f
ee20cb60e81ce84f0d965af75126251a85717535
7b110c9c2f5c7b6c1ae2eaccbb0a8527429cba8d
f4c028a8e4d7a2334096a047728fc00e286a8623
2fd313246bab014b7ada7bc1453414c74f2988c2
3c2d111964d18fc2f9174fe5818bcfc72b0d4f18

Please rebase the branch and force-push.

[dscho]

This was a lot of work, yet — as time told — the core Git developers seem to be more interested in code style and real names in Signed-off-by: footers than this kind of attempt at advancing the project. Therefore I will cut my losses at this point.