mbox series

[v2,0/9] Prepare for changing the default branch name main (last manual part)

Message ID pull.758.v2.git.1603461606.gitgitgadget@gmail.com (mailing list archive)
Headers show
Series Prepare for changing the default branch name main (last manual part) | expand

Message

ZheNing Hu via GitGitGadget Oct. 23, 2020, 1:59 p.m. UTC
In preparation for changing the default of init.defaultBranch to main, here
are a couple of manual adjustments that cannot be automated (i.e., these
adjustments are not mere search-and-replaces).

This patch series is based on js/default-branch-name-part-3, and is part of
the larger effort tracked at https://github.com/gitgitgadget/git/pull/655.

The next patch series will be largely automated search-and-replaces;
Obviously, the search-and-replace was the easy part, the manual inspection
whether the changes are actually correct was much more involved.

What to expect next, after this patch series? Essentially, there is the
large patch series that adjusts the entire test suite, with two patch series
extracted from that effort: t5411 and t5515 simply require too large
patches, and will therefore be presented as the next patch series after this
one.

Changes since v1:

 * The t4013 patch was moved out of this patch series, to be re-submitted at
   a later date, to avoid clashing with other patches in seen.
 * The commit message of 'fmt-merge-msg: also suppress "into main" by
   default' was adjusted to mention that we do the same for main as we do
   for master.
 * The t5703 patch now uses rain instead of none, to be closer to the
   default branch name.
 * The glob in t6200 was tightened to avoid matching maint.
 * The commit message of 't3200: prepare for main being shorter than master'
   stopped talking about main2 (which itself was a left-over from a previous
   iteration of a previous patch series).

Johannes Schindelin (9):
  fmt-merge-msg: also suppress "into main" by default
  t9801: use `--` in preparation for default branch rename
  tests: start moving to a different default main branch name
  t6200: adjust suppression pattern to also match "main"
  t5703: adjust a test case for the upcoming default branch name
  t3200: prepare for `main` being shorter than `master`
  t9902: prepare a test for the upcoming default branch name
  tests: prepare aligned mentions of the default branch name
  t1400: prepare for `main` being default branch name

 fmt-merge-msg.c                    |  4 +-
 refs.c                             |  5 ++-
 t/lib-submodule-update.sh          |  2 +-
 t/t0001-init.sh                    | 13 ++++--
 t/t1400-update-ref.sh              | 10 ++---
 t/t3200-branch.sh                  | 16 +++----
 t/t3201-branch-contains.sh         |  8 ++--
 t/t3203-branch-output.sh           |  4 +-
 t/t3205-branch-color.sh            |  8 ++--
 t/t5505-remote.sh                  | 30 ++++++-------
 t/t5510-fetch.sh                   |  8 ++--
 t/t5526-fetch-submodules.sh        | 70 +++++++++++++++---------------
 t/t5606-clone-options.sh           |  3 ++
 t/t5703-upload-pack-ref-in-want.sh |  6 +--
 t/t6200-fmt-merge-msg.sh           |  2 +-
 t/t6302-for-each-ref-filter.sh     | 24 +++++-----
 t/t9801-git-p4-branch.sh           | 12 ++---
 t/t9902-completion.sh              |  6 +--
 t/test-lib.sh                      |  7 +++
 19 files changed, 130 insertions(+), 108 deletions(-)


base-commit: 538228ed23a1d5e17e89bb17086d4dda51325bd8
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-758%2Fdscho%2Fprepare-for-main-branch-manual-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-758/dscho/prepare-for-main-branch-manual-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/758

Range-diff vs v1:

  1:  cf950c6f6a !  1:  bd2c72a348 fmt-merge-msg: also suppress "into main" by default
     @@ Commit message
          fmt-merge-msg: also suppress "into main" by default
      
          In preparation for changing the default branch name to `main`, let's
     -    skip the suffix "into main" in merge commit messages.
     +    skip the suffix "into main" in merge commit messages, the same way that
     +    "into master" has been skipped by default.
      
          Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
      
  2:  5849eda331 =  2:  e819084eb3 t9801: use `--` in preparation for default branch rename
  3:  d9469202c2 =  3:  9c608c311e tests: start moving to a different default main branch name
  4:  baeb01f706 <  -:  ---------- t4013: prepare for the new default branch name "main"
  5:  7860d8d7df !  4:  9bd0a89a79 t6200: adjust suppression pattern to also match "main"
     @@ t/t6200-fmt-merge-msg.sh: test_expect_success 'merge.suppressDest configuration'
       	grep -e "Merge branch .side. into master$" actual &&
       
      -	git -c merge.suppressDest="ma??er" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
     -+	git -c merge.suppressDest="ma*" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
     ++	git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
       	head -n1 full.3 >actual &&
       	grep -e "Merge branch .side." actual &&
       	! grep -e " into master$" actual
  6:  0d2511d18f !  5:  b557ea5ac0 t5703: adjust a test case for the upcoming default branch name
     @@ t/t5703-upload-pack-ref-in-want.sh: test_expect_success 'server is initially beh
       	rm -rf local &&
       	cp -r "$LOCAL_PRISTINE" local &&
      -	echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
     -+	echo "s/main/none/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
     ++	echo "s/main/rain/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
       	test_must_fail git -C local fetch 2>err &&
       
      -	test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
     -+	test_i18ngrep "fatal: remote error: unknown ref refs/heads/none" err
     ++	test_i18ngrep "fatal: remote error: unknown ref refs/heads/rain" err
       '
       
       # DO NOT add non-httpd-specific tests here, because the last part of this
  7:  e1740bb7d7 !  6:  959a770c23 t3200: prepare for `main` being shorter than `master`
     @@ Commit message
      
          In the test case adjusted by this patch, we want to cut just after the
          longest shown ref name. Since `main` is shorter than `master`, we need
     -    to decrease the number of characters. Since `main2` is shown, too, and
     +    to decrease the number of characters. Since `topic` is shown, too, and
          since that is only one character shorter than `master`, we decrement the
     -    length by one.
     +    length by one instead of two.
      
          Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
      
  8:  1641d1950d =  7:  8db960009d t9902: prepare a test for the upcoming default branch name
  9:  5c29a89d88 =  8:  d15e39bb73 tests: prepare aligned mentions of the default branch name
 10:  66365bce55 =  9:  e542010fdd t1400: prepare for `main` being default branch name

Comments

Junio C Hamano Oct. 23, 2020, 3:59 p.m. UTC | #1
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> Changes since v1:
>
>  * The t4013 patch was moved out of this patch series, to be re-submitted at
>    a later date, to avoid clashing with other patches in seen.
>  * The commit message of 'fmt-merge-msg: also suppress "into main" by
>    default' was adjusted to mention that we do the same for main as we do
>    for master.
>  * The t5703 patch now uses rain instead of none, to be closer to the
>    default branch name.
>  * The glob in t6200 was tightened to avoid matching maint.
>  * The commit message of 't3200: prepare for main being shorter than master'
>    stopped talking about main2 (which itself was a left-over from a previous
>    iteration of a previous patch series).

All looked sensible.  Thanks; will replace and hopefully we can move
these to 'next' once we rebuild it on 2.29.