git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] t4013: prepare for the new default branch name "main"
@ 2020-11-08  9:59 Johannes Schindelin via GitGitGadget
  2020-11-11 21:43 ` Johannes Schindelin
  0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2020-11-08  9:59 UTC (permalink / raw)
  To: git; +Cc: Johannes Schindelin, Johannes Schindelin

From: Johannes Schindelin <johannes.schindelin@gmx.de>

This patch is a bit involved, mainly because the default branch name is
not only hard-coded in the script `t4013-diff-various.sh` itself, and
not only in the support files in `t/t4013/`, but also in the _file
names_ in `t/t4013/`.

The trick to adjust this test script was performed by inserting the
definition GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main at the beginning of
the test script, and then running these commands:

(cd t &&
 sed -i 's/master/main/g' -- \
	$(git grep -l master HEAD -- ./t4013\* | sed 's/HEAD://'))

and

eval "$(git ls-files t/t4013/ | sed -n \
	-e 's/\(.*\)master\(.*\)master\(.*\)/git mv & \1main\2main\3;/p')"

and

eval "$(git ls-files t/t4013/ | sed -n \
	-e 's/\(.*\)master\(.*\)/git mv & \1main\2;/p')"

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
    t4013: prepare for the new default branch name "main"
    
    This is yet another big patch in the flurry of patch series on the way
    to switch the default branch name used by git init to main.
    
    I pulled this out from js/default-branch-name-part-4-minus-1 because 
    mk/diff-ignore-regex was still in flight, and conflicted with this here
    patch.
    
    Unfortunately, in the meantime so/log-diff-merge entered seen, and it
    conflicts, too. So it seems that I waited a bit too long... sigh. To
    help move this patch forward (because it blocks quite a few patch series
    on my side), I based this patch on git/git's master.
    
    The conflicts are more than mere merge conflicts, of course: the patch
    renames a couple of files in t/t4013/ and edits those files to replace
    any mention of master with main. Concretely, these commands were
    executed:
    
    (cd t &&
         sed -i 's/master/main/g' -- $(git grep -l master -- ./t4013\*))
    eval "$(git ls-files t/t4013/ | sed -n \
                -e 's/\(.*\)master\(.*\)master\(.*\)/git mv & \1main\2main\3;/p')"
    eval "$(git ls-files t/t4013/ | sed -n \
                -e 's/\(.*\)master\(.*\)/git mv & \1main\2;/p')"
    
    In fact, the only thing this patch does on top of the result of those
    commands is to set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main in t4013.
    
    I wonder whether it would be better to apply the semantic equivalent of
    this patch on top of js/default-branch-name-part-4-minus-1, then merge 
    mk/diff-ignore-regex (resolving the conflicts essentially by re-issuing
    the commands), and then merge so/log-diff-merge. I tried that and pushed
    it up as the 
    prepare-for-main-branch-t4013-plus-mk/diff-ignore-regex-plus-so/log-diff-merge 
    branch to https://github.com/dscho/git. Unfortunately, so/log-diff-merge 
    branches off from a much later commit in git/git's master than 
    js/default-branch-name-part-4-minus-1, therefore the commit graph of
    that branch looks a bit messy.
    
    So I tried another approach: rebasing so/log-diff-merge on top of this
    here patch, adjusting the patches as needed. The result can be found at 
    https://github.com/dscho/git as 
    prepare-for-main-branch-t4013-plus-adjusted-so/log-diff-merge. The
    output of git range-diff e2850a27a95..f4150457c7d
    ca254612280..3cd3222b22e reads like this:
    
     1:  8e30afd4140 !  1:  17b198661f6 revision: factor out parsing of diff-merge related options
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## revision.c ##
         @@ revision.c: static void add_message_grep(struct rev_info *revs, const char *pattern)
     2:  1f3770bcd09 !  2:  f0de70ab6bd revision: factor out setup of diff-merge related settings
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## revision.c ##
         @@ revision.c: static int parse_diff_merge_opts(struct rev_info *revs, const char **argv) {
     3:  acabfff0740 !  3:  3f3d217c3b5 revision: factor out initialization of diff-merge related settings
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## revision.c ##
         @@ revision.c: static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
     4:  405aa89dfeb !  4:  3f78fd73e74 revision: provide implementation for diff merges tweaks
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## builtin/log.c ##
         @@ builtin/log.c: static int show_tree_object(const struct object_id *oid,
     5:  1ac1179a479 !  5:  574473b8ccb revision: move diff merges functions to its own diff-merges.c
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## Makefile ##
         @@ Makefile: LIB_OBJS += date.o
     6:  99043703aff !  6:  7d237cb9df1 diff-merges: rename all functions to have common prefix
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## builtin/log.c ##
         @@ builtin/log.c: static int show_tree_object(const struct object_id *oid,
     7:  3ffcf8dd2ac !  7:  95993b629ac diff-merges: move checks for first_parent_only out of the module
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## builtin/log.c ##
         @@ builtin/log.c: static int show_tree_object(const struct object_id *oid,
     8:  b14e0c06319 !  8:  4c1897a9f1c diff-merges: rename diff_merges_default_to_enable() to match semantics
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## builtin/log.c ##
         @@ builtin/log.c: static void show_setup_revisions_tweak(struct rev_info *rev,
     9:  c3a3db7d41f !  9:  f256249a306 diff-merges: re-arrange functions to match the order they are called in
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@
    10:  8f260eab8ed ! 10:  31285aa5fb5 diff-merges: new function diff_merges_suppress()
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## builtin/merge.c ##
         @@
    11:  820e1f08837 ! 11:  6f7388b2d7c diff-merges: new function diff_merges_set_dense_combined_if_unset()
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## builtin/diff-files.c ##
         @@
    12:  c1cd628d982 ! 12:  9e24bee0010 diff-merges: introduce revs->first_parent_merges flag
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@ diff-merges.c: void diff_merges_suppress(struct rev_info *revs) {
    13:  dac39d0bc1c ! 13:  75d7de500ae diff-merges: revise revs->diff flag handling
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@ diff-merges.c: int diff_merges_parse_opts(struct rev_info *revs, const char **argv) {
    14:  ead9e513b51 ! 14:  435e5169cfc t4013: support test_expect_failure through ':failure' magic
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## t/t4013-diff-various.sh ##
         @@ t/t4013-diff-various.sh: process_diffs () {
    15:  fe299a0b5fa ! 15:  09e575c53ed t4013: add tests for -m failing to override -c/--cc
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## t/t4013-diff-various.sh ##
        -@@ t/t4013-diff-various.sh: log --first-parent --diff-merges=off -p master
        - log -p --first-parent master
        - log -m -p --first-parent master
        - log -m -p master
        -+:failure log --cc -m -p master
        -+:failure log -c -m -p master
        - log -SF master
        - log -S F master
        - log -SF -p master
        +@@ t/t4013-diff-various.sh: log --first-parent --diff-merges=off -p main
        + log -p --first-parent main
        + log -m -p --first-parent main
        + log -m -p main
        ++:failure log --cc -m -p main
        ++:failure log -c -m -p main
        + log -SF main
        + log -S F main
        + log -SF -p main
        +@@ t/t4013-diff-various.sh: log -SF main --max-count=2
        + log -GF main
        + log -GF -p main
        + log -GF -p --pickaxe-all main
        +-log -IA -IB -I1 -I2 -p main
        + log --decorate --all
        + log --decorate=full --all
        + 
    
        - ## t/t4013/diff.log_--cc_-m_-p_master (new) ##
        + ## t/t4013/diff.log_--cc_-m_-p_main (new) ##
         @@
        -+$ git log --cc -m -p master
        ++$ git log --cc -m -p main
         +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
         +Merge: 9a6d494 c7a2ab9
         +Author: A U Thor <author@example.com>
        @@ -1,3 +0,0 @@
         +    Initial
         +$
    
        - ## t/t4013/diff.log_-c_-m_-p_master (new) ##
        + ## t/t4013/diff.log_-c_-m_-p_main (new) ##
         @@
        -+$ git log -c -m -p master
        ++$ git log -c -m -p main
         +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
         +Merge: 9a6d494 c7a2ab9
         +Author: A U Thor <author@example.com>
    16:  1d617dc2d90 <  -:  ----------- diff-merges: fix -m to properly override -c/--cc
     -:  ----------- > 16:  52f2012a8a8 diff-merges: fix -m to properly override -c/--cc
    17:  0526b313b86 ! 17:  3417f2fd0e4 diff-merges: split 'ignore_merges' field
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@
    18:  7f188afab8b ! 18:  ab9b959cf44 diff-merges: group diff-merge flags next to each other inside 'rev_info'
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## revision.h ##
         @@ revision.h: struct rev_info {
    19:  38ec10c12a8 ! 19:  328fbd9c650 diff-merges: get rid of now empty diff_merges_init_revs()
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@ diff-merges.c: static void set_dense_combined(struct rev_info *revs) {
    20:  c85c889ae46 ! 20:  ce20b95e25b diff-merges: refactor opt settings into separate functions
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@ diff-merges.c: static void suppress(struct rev_info *revs) {
    21:  283182de25d ! 21:  e96a3e193cb diff-merges: make -m/-c/--cc explicitly mutually exclusive
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@ diff-merges.c: static void suppress(struct rev_info *revs) {
    22:  f80baa896df ! 22:  8ccbb1a002b diff-merges: implement new values for --diff-merges
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## diff-merges.c ##
         @@ diff-merges.c: static void set_separate(struct rev_info *revs) {
    23:  551e4dc3a62 ! 23:  92e4f9483cd t4013: add test for --diff-merges=first-parent
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## t/t4013-diff-various.sh ##
        -@@ t/t4013-diff-various.sh: log --no-diff-merges -p --first-parent master
        - log --diff-merges=off -p --first-parent master
        - log --first-parent --diff-merges=off -p master
        - log -p --first-parent master
        -+log -p --diff-merges=first-parent master
        - log -m -p --first-parent master
        - log -m -p master
        - log --cc -m -p master
        +@@ t/t4013-diff-various.sh: log --no-diff-merges -p --first-parent main
        + log --diff-merges=off -p --first-parent main
        + log --first-parent --diff-merges=off -p main
        + log -p --first-parent main
        ++log -p --diff-merges=first-parent main
        + log -m -p --first-parent main
        + log -m -p main
        + log --cc -m -p main
    
        - ## t/t4013/diff.log_-p_--diff-merges=first-parent_master (new) ##
        + ## t/t4013/diff.log_-p_--diff-merges=first-parent_main (new) ##
         @@
        -+$ git log -p --diff-merges=first-parent master
        ++$ git log -p --diff-merges=first-parent main
         +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
         +Merge: 9a6d494 c7a2ab9
         +Author: A U Thor <author@example.com>
    24:  f0eb0eaf605 ! 24:  da78bc75e5e doc/git-log: describe new --diff-merges options
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## Documentation/git-log.txt ##
         @@ Documentation/git-log.txt: DIFF FORMATTING
    25:  7178aa87622 ! 25:  906b93dc4bf doc/diff-generate-patch: mention new --diff-merges option
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## Documentation/diff-generate-patch.txt ##
         @@ Documentation/diff-generate-patch.txt: Combined diff format
    26:  f4150457c7d ! 26:  3cd3222b22e doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
        @@ Commit message
    
             Signed-off-by: Sergey Organov <sorganov@gmail.com>
             Signed-off-by: Junio C Hamano <gitster@pobox.com>
        +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    
          ## Documentation/rev-list-options.txt ##
         @@ Documentation/rev-list-options.txt: parents) and `--max-parents=-1` (negative numbers denote no upper limit).

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-783%2Fdscho%2Fprepare-for-main-branch-t4013-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-783/dscho/prepare-for-main-branch-t4013-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/783

 t/t4013-diff-various.sh                       | 181 +++++++++---------
 ...ree_--cc_--patch-with-stat_--summary_main} |   2 +-
 ...iff.diff-tree_--cc_--patch-with-stat_main} |   2 +-
 ...r => diff.diff-tree_--cc_--shortstat_main} |   2 +-
 ...diff.diff-tree_--cc_--stat_--summary_main} |   2 +-
 ...master => diff.diff-tree_--cc_--stat_main} |   2 +-
 ...e_--cc_master => diff.diff-tree_--cc_main} |   2 +-
 ...master => diff.diff-tree_-c_--abbrev_main} |   2 +-
 ...> diff.diff-tree_-c_--stat_--summary_main} |   2 +-
 ...t_master => diff.diff-tree_-c_--stat_main} |   2 +-
 ...-tree_-c_master => diff.diff-tree_-c_main} |   2 +-
 ...-p_-m_master => diff.diff-tree_-p_-m_main} |   2 +-
 t/t4013/diff.diff-tree_-p_main                |   2 +
 t/t4013/diff.diff-tree_-p_master              |   2 -
 t/t4013/diff.diff-tree_main                   |   2 +
 t/t4013/diff.diff-tree_master                 |   2 -
 t/t4013/diff.diff_--dirstat_--cc_main~1_main  |   3 +
 .../diff.diff_--dirstat_--cc_master~1_master  |   3 -
 t/t4013/diff.diff_--dirstat_main~1_main~2     |   3 +
 t/t4013/diff.diff_--dirstat_master~1_master~2 |   3 -
 ...ff.diff_--line-prefix=abc_main_main^_side} |   2 +-
 ...master^_side => diff.diff_main_main^_side} |   2 +-
 ...mat-patch_--attach_--stdout_initial..main} |   2 +-
 ...at-patch_--attach_--stdout_initial..main^} |   2 +-
 ...e_--stdout_--numbered-files_initial..main} |   2 +-
 ...t_--subject-prefix=TESTCASE_initial..main} |   2 +-
 ...mat-patch_--inline_--stdout_initial..main} |   2 +-
 ...at-patch_--inline_--stdout_initial..main^} |   2 +-
 ...t-patch_--inline_--stdout_initial..main^^} |   2 +-
 ...--stdout_--cover-letter_-n_initial..main^} |   2 +-
 ...atch_--stdout_--no-numbered_initial..main} |   2 +-
 ...t-patch_--stdout_--numbered_initial..main} |   2 +-
 ... diff.format-patch_--stdout_initial..main} |   2 +-
 ...diff.format-patch_--stdout_initial..main^} |   2 +-
 t/t4013/diff.log_--decorate=full_--all        |   2 +-
 t/t4013/diff.log_--decorate_--all             |   2 +-
 ..._--diff-merges=off_-p_--first-parent_main} |   2 +-
 ..._--first-parent_--diff-merges=off_-p_main} |   2 +-
 ...g_--no-diff-merges_-p_--first-parent_main} |   2 +-
 ..._--patch-with-stat_--summary_main_--_dir_} |   2 +-
 ...master => diff.log_--patch-with-stat_main} |   2 +-
 ...> diff.log_--patch-with-stat_main_--_dir_} |   2 +-
 ...oot_--cc_--patch-with-stat_--summary_main} |   2 +-
 ...g_--root_--patch-with-stat_--summary_main} |   2 +-
 ...=> diff.log_--root_--patch-with-stat_main} |   2 +-
 ...-root_-c_--patch-with-stat_--summary_main} |   2 +-
 ...root_-p_master => diff.log_--root_-p_main} |   2 +-
 ...log_--root_master => diff.log_--root_main} |   2 +-
 ...ter => diff.log_-GF_-p_--pickaxe-all_main} |   2 +-
 ...log_-GF_-p_master => diff.log_-GF_-p_main} |   2 +-
 ...{diff.log_-SF_master => diff.log_-GF_main} |   2 +-
 ...aster => diff.log_-IA_-IB_-I1_-I2_-p_main} |   2 +-
 ...log_-SF_-p_master => diff.log_-SF_-p_main} |   2 +-
 ...{diff.log_-GF_master => diff.log_-SF_main} |   2 +-
 t/t4013/diff.log_-SF_main_--max-count=0       |   2 +
 ...ount=2 => diff.log_-SF_main_--max-count=1} |   2 +-
 t/t4013/diff.log_-SF_main_--max-count=2       |   7 +
 t/t4013/diff.log_-SF_master_--max-count=0     |   2 -
 t/t4013/diff.log_-SF_master_--max-count=1     |   7 -
 ...iff.log_-S_F_master => diff.log_-S_F_main} |   2 +-
 ...ter => diff.log_-m_-p_--first-parent_main} |   2 +-
 ...f.log_-m_-p_master => diff.log_-m_-p_main} |   2 +-
 ...master => diff.log_-p_--first-parent_main} |   2 +-
 .../{diff.log_-p_master => diff.log_-p_main}  |   2 +-
 t/t4013/{diff.log_master => diff.log_main}    |   2 +-
 ...iff.noellipses-diff-tree_-c_--abbrev_main} |   2 +-
 ...> diff.noellipses-whatchanged_--root_main} |   2 +-
 ...r => diff.noellipses-whatchanged_-SF_main} |   2 +-
 ...aster => diff.noellipses-whatchanged_main} |   2 +-
 ...t_master => diff.show_--first-parent_main} |   2 +-
 ...{diff.show_-c_master => diff.show_-c_main} |   2 +-
 ...{diff.show_-m_master => diff.show_-m_main} |   2 +-
 t/t4013/{diff.show_master => diff.show_main}  |   2 +-
 ..._--patch-with-stat_--summary_main_--_dir_} |   2 +-
 ...> diff.whatchanged_--patch-with-stat_main} |   2 +-
 ...hatchanged_--patch-with-stat_main_--_dir_} |   2 +-
 ...oot_--cc_--patch-with-stat_--summary_main} |   2 +-
 ...d_--root_--patch-with-stat_--summary_main} |   2 +-
 ...whatchanged_--root_--patch-with-stat_main} |   2 +-
 ...-root_-c_--patch-with-stat_--summary_main} |   2 +-
 ...master => diff.whatchanged_--root_-p_main} |   2 +-
 ...ot_master => diff.whatchanged_--root_main} |   2 +-
 ...-p_master => diff.whatchanged_-SF_-p_main} |   2 +-
 ...d_-SF_master => diff.whatchanged_-SF_main} |   2 +-
 ...ged_-p_master => diff.whatchanged_-p_main} |   2 +-
 ...atchanged_master => diff.whatchanged_main} |   2 +-
 86 files changed, 184 insertions(+), 181 deletions(-)
 rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_--summary_master => diff.diff-tree_--cc_--patch-with-stat_--summary_main} (86%)
 rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_master => diff.diff-tree_--cc_--patch-with-stat_main} (89%)
 rename t/t4013/{diff.diff-tree_--cc_--shortstat_master => diff.diff-tree_--cc_--shortstat_main} (65%)
 rename t/t4013/{diff.diff-tree_-c_--stat_--summary_master => diff.diff-tree_--cc_--stat_--summary_main} (71%)
 rename t/t4013/{diff.diff-tree_-c_--stat_master => diff.diff-tree_--cc_--stat_main} (76%)
 rename t/t4013/{diff.diff-tree_--cc_master => diff.diff-tree_--cc_main} (91%)
 rename t/t4013/{diff.diff-tree_-c_--abbrev_master => diff.diff-tree_-c_--abbrev_main} (83%)
 rename t/t4013/{diff.diff-tree_--cc_--stat_--summary_master => diff.diff-tree_-c_--stat_--summary_main} (70%)
 rename t/t4013/{diff.diff-tree_--cc_--stat_master => diff.diff-tree_-c_--stat_main} (75%)
 rename t/t4013/{diff.diff-tree_-c_master => diff.diff-tree_-c_main} (93%)
 rename t/t4013/{diff.diff-tree_-p_-m_master => diff.diff-tree_-p_-m_main} (97%)
 create mode 100644 t/t4013/diff.diff-tree_-p_main
 delete mode 100644 t/t4013/diff.diff-tree_-p_master
 create mode 100644 t/t4013/diff.diff-tree_main
 delete mode 100644 t/t4013/diff.diff-tree_master
 create mode 100644 t/t4013/diff.diff_--dirstat_--cc_main~1_main
 delete mode 100644 t/t4013/diff.diff_--dirstat_--cc_master~1_master
 create mode 100644 t/t4013/diff.diff_--dirstat_main~1_main~2
 delete mode 100644 t/t4013/diff.diff_--dirstat_master~1_master~2
 rename t/t4013/{diff.diff_--line-prefix=abc_master_master^_side => diff.diff_--line-prefix=abc_main_main^_side} (87%)
 rename t/t4013/{diff.diff_master_master^_side => diff.diff_main_main^_side} (89%)
 rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master => diff.format-patch_--attach_--stdout_initial..main} (98%)
 rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master^ => diff.format-patch_--attach_--stdout_initial..main^} (97%)
 rename t/t4013/{diff.format-patch_--inline_--stdout_--numbered-files_initial..master => diff.format-patch_--inline_--stdout_--numbered-files_initial..main} (99%)
 rename t/t4013/{diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master => diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main} (99%)
 rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master => diff.format-patch_--inline_--stdout_initial..main} (98%)
 rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^ => diff.format-patch_--inline_--stdout_initial..main^} (97%)
 rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^^ => diff.format-patch_--inline_--stdout_initial..main^^} (95%)
 rename t/t4013/{diff.format-patch_--stdout_--cover-letter_-n_initial..master^ => diff.format-patch_--stdout_--cover-letter_-n_initial..main^} (96%)
 rename t/t4013/{diff.format-patch_--stdout_--no-numbered_initial..master => diff.format-patch_--stdout_--no-numbered_initial..main} (97%)
 rename t/t4013/{diff.format-patch_--stdout_--numbered_initial..master => diff.format-patch_--stdout_--numbered_initial..main} (97%)
 rename t/t4013/{diff.format-patch_--stdout_initial..master => diff.format-patch_--stdout_initial..main} (97%)
 rename t/t4013/{diff.format-patch_--stdout_initial..master^ => diff.format-patch_--stdout_initial..main^} (96%)
 rename t/t4013/{diff.log_--no-diff-merges_-p_--first-parent_master => diff.log_--diff-merges=off_-p_--first-parent_main} (95%)
 rename t/t4013/{diff.log_--first-parent_--diff-merges=off_-p_master => diff.log_--first-parent_--diff-merges=off_-p_main} (95%)
 rename t/t4013/{diff.log_--diff-merges=off_-p_--first-parent_master => diff.log_--no-diff-merges_-p_--first-parent_main} (95%)
 rename t/t4013/{diff.log_--patch-with-stat_--summary_master_--_dir_ => diff.log_--patch-with-stat_--summary_main_--_dir_} (96%)
 rename t/t4013/{diff.log_--patch-with-stat_master => diff.log_--patch-with-stat_main} (98%)
 rename t/t4013/{diff.log_--patch-with-stat_master_--_dir_ => diff.log_--patch-with-stat_main_--_dir_} (96%)
 rename t/t4013/{diff.log_--root_--cc_--patch-with-stat_--summary_master => diff.log_--root_--cc_--patch-with-stat_--summary_main} (98%)
 rename t/t4013/{diff.log_--root_--patch-with-stat_--summary_master => diff.log_--root_--patch-with-stat_--summary_main} (98%)
 rename t/t4013/{diff.log_--root_--patch-with-stat_master => diff.log_--root_--patch-with-stat_main} (98%)
 rename t/t4013/{diff.log_--root_-c_--patch-with-stat_--summary_master => diff.log_--root_-c_--patch-with-stat_--summary_main} (98%)
 rename t/t4013/{diff.log_--root_-p_master => diff.log_--root_-p_main} (98%)
 rename t/t4013/{diff.log_--root_master => diff.log_--root_main} (96%)
 rename t/t4013/{diff.log_-GF_-p_--pickaxe-all_master => diff.log_-GF_-p_--pickaxe-all_main} (90%)
 rename t/t4013/{diff.log_-GF_-p_master => diff.log_-GF_-p_main} (91%)
 rename t/t4013/{diff.log_-SF_master => diff.log_-GF_main} (86%)
 rename t/t4013/{diff.log_-IA_-IB_-I1_-I2_-p_master => diff.log_-IA_-IB_-I1_-I2_-p_main} (97%)
 rename t/t4013/{diff.log_-SF_-p_master => diff.log_-SF_-p_main} (91%)
 rename t/t4013/{diff.log_-GF_master => diff.log_-SF_main} (86%)
 create mode 100644 t/t4013/diff.log_-SF_main_--max-count=0
 rename t/t4013/{diff.log_-SF_master_--max-count=2 => diff.log_-SF_main_--max-count=1} (79%)
 create mode 100644 t/t4013/diff.log_-SF_main_--max-count=2
 delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=0
 delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=1
 rename t/t4013/{diff.log_-S_F_master => diff.log_-S_F_main} (86%)
 rename t/t4013/{diff.log_-m_-p_--first-parent_master => diff.log_-m_-p_--first-parent_main} (97%)
 rename t/t4013/{diff.log_-m_-p_master => diff.log_-m_-p_main} (99%)
 rename t/t4013/{diff.log_-p_--first-parent_master => diff.log_-p_--first-parent_main} (97%)
 rename t/t4013/{diff.log_-p_master => diff.log_-p_main} (98%)
 rename t/t4013/{diff.log_master => diff.log_main} (97%)
 rename t/t4013/{diff.noellipses-diff-tree_-c_--abbrev_master => diff.noellipses-diff-tree_-c_--abbrev_main} (81%)
 rename t/t4013/{diff.noellipses-whatchanged_--root_master => diff.noellipses-whatchanged_--root_main} (96%)
 rename t/t4013/{diff.noellipses-whatchanged_-SF_master => diff.noellipses-whatchanged_-SF_main} (86%)
 rename t/t4013/{diff.noellipses-whatchanged_master => diff.noellipses-whatchanged_main} (96%)
 rename t/t4013/{diff.show_--first-parent_master => diff.show_--first-parent_main} (92%)
 rename t/t4013/{diff.show_-c_master => diff.show_-c_main} (95%)
 rename t/t4013/{diff.show_-m_master => diff.show_-m_main} (98%)
 rename t/t4013/{diff.show_master => diff.show_main} (96%)
 rename t/t4013/{diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ => diff.whatchanged_--patch-with-stat_--summary_main_--_dir_} (94%)
 rename t/t4013/{diff.whatchanged_--patch-with-stat_master => diff.whatchanged_--patch-with-stat_main} (97%)
 rename t/t4013/{diff.whatchanged_--patch-with-stat_master_--_dir_ => diff.whatchanged_--patch-with-stat_main_--_dir_} (94%)
 rename t/t4013/{diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master => diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main} (97%)
 rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_--summary_master => diff.whatchanged_--root_--patch-with-stat_--summary_main} (97%)
 rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_master => diff.whatchanged_--root_--patch-with-stat_main} (97%)
 rename t/t4013/{diff.whatchanged_--root_-c_--patch-with-stat_--summary_master => diff.whatchanged_--root_-c_--patch-with-stat_--summary_main} (97%)
 rename t/t4013/{diff.whatchanged_--root_-p_master => diff.whatchanged_--root_-p_main} (98%)
 rename t/t4013/{diff.whatchanged_--root_master => diff.whatchanged_--root_main} (97%)
 rename t/t4013/{diff.whatchanged_-SF_-p_master => diff.whatchanged_-SF_-p_main} (89%)
 rename t/t4013/{diff.whatchanged_-SF_master => diff.whatchanged_-SF_main} (86%)
 rename t/t4013/{diff.whatchanged_-p_master => diff.whatchanged_-p_main} (98%)
 rename t/t4013/{diff.whatchanged_master => diff.whatchanged_main} (97%)

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index f72d456d3b..25c2952c40 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -5,6 +5,9 @@
 
 test_description='Various diff formatting options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
@@ -61,7 +64,7 @@ test_expect_success setup '
 	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
-	git checkout master &&
+	git checkout main &&
 	git pull -s ours . side &&
 
 	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
@@ -86,7 +89,7 @@ test_expect_success setup '
 	for i in B A; do echo $i; done >dir/sub &&
 	git add dir/sub &&
 	git commit -m "Rearranged lines in dir/sub" &&
-	git checkout master &&
+	git checkout main &&
 
 	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
 	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
@@ -94,7 +97,7 @@ test_expect_success setup '
 	git checkout -b mode initial &&
 	git update-index --chmod=+x file0 &&
 	git commit -m "update mode" &&
-	git checkout -f master &&
+	git checkout -f main &&
 
 	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
 	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
@@ -103,12 +106,12 @@ test_expect_success setup '
 	git update-index --chmod=+x file2 &&
 	git commit -m "update mode (file2)" &&
 	git notes add -m "note" &&
-	git checkout -f master &&
+	git checkout -f main &&
 
-	# Same merge as master, but with parents reversed. Hide it in a
+	# Same merge as main, but with parents reversed. Hide it in a
 	# pseudo-ref to avoid impacting tests with --all.
 	commit=$(echo reverse |
-		 git commit-tree -p master^2 -p master^1 master^{tree}) &&
+		 git commit-tree -p main^2 -p main^1 main^{tree}) &&
 	git update-ref REVERSE $commit &&
 
 	git config diff.renames false &&
@@ -118,15 +121,15 @@ test_expect_success setup '
 
 : <<\EOF
 ! [initial] Initial
- * [master] Merge branch 'side'
+ * [main] Merge branch 'side'
   ! [rearrange] Rearranged lines in dir/sub
    ! [side] Side
 ----
   +  [rearrange] Rearranged lines in dir/sub
- -   [master] Merge branch 'side'
+ -   [main] Merge branch 'side'
  * + [side] Side
- *   [master^] Third
- *   [master~2] Second
+ *   [main^] Third
+ *   [main~2] Second
 +*++ [initial] Initial
 EOF
 
@@ -284,92 +287,92 @@ diff-tree initial mode
 diff-tree --stat initial mode
 diff-tree --summary initial mode
 
-diff-tree master
-diff-tree -p master
-diff-tree -p -m master
-diff-tree -c master
-diff-tree -c --abbrev master
-:noellipses diff-tree -c --abbrev master
-diff-tree --cc master
+diff-tree main
+diff-tree -p main
+diff-tree -p -m main
+diff-tree -c main
+diff-tree -c --abbrev main
+:noellipses diff-tree -c --abbrev main
+diff-tree --cc main
 # stat only should show the diffstat with the first parent
-diff-tree -c --stat master
-diff-tree --cc --stat master
-diff-tree -c --stat --summary master
-diff-tree --cc --stat --summary master
+diff-tree -c --stat main
+diff-tree --cc --stat main
+diff-tree -c --stat --summary main
+diff-tree --cc --stat --summary main
 # stat summary should show the diffstat and summary with the first parent
 diff-tree -c --stat --summary side
 diff-tree --cc --stat --summary side
-diff-tree --cc --shortstat master
+diff-tree --cc --shortstat main
 diff-tree --cc --summary REVERSE
 # improved by Timo's patch
-diff-tree --cc --patch-with-stat master
+diff-tree --cc --patch-with-stat main
 # improved by Timo's patch
-diff-tree --cc --patch-with-stat --summary master
+diff-tree --cc --patch-with-stat --summary main
 # this is correct
 diff-tree --cc --patch-with-stat --summary side
 
-log master
-log -p master
-log --root master
-log --root -p master
-log --patch-with-stat master
-log --root --patch-with-stat master
-log --root --patch-with-stat --summary master
+log main
+log -p main
+log --root main
+log --root -p main
+log --patch-with-stat main
+log --root --patch-with-stat main
+log --root --patch-with-stat --summary main
 # improved by Timo's patch
-log --root -c --patch-with-stat --summary master
+log --root -c --patch-with-stat --summary main
 # improved by Timo's patch
-log --root --cc --patch-with-stat --summary master
-log --no-diff-merges -p --first-parent master
-log --diff-merges=off -p --first-parent master
-log --first-parent --diff-merges=off -p master
-log -p --first-parent master
-log -m -p --first-parent master
-log -m -p master
-log -SF master
-log -S F master
-log -SF -p master
-log -SF master --max-count=0
-log -SF master --max-count=1
-log -SF master --max-count=2
-log -GF master
-log -GF -p master
-log -GF -p --pickaxe-all master
-log -IA -IB -I1 -I2 -p master
+log --root --cc --patch-with-stat --summary main
+log --no-diff-merges -p --first-parent main
+log --diff-merges=off -p --first-parent main
+log --first-parent --diff-merges=off -p main
+log -p --first-parent main
+log -m -p --first-parent main
+log -m -p main
+log -SF main
+log -S F main
+log -SF -p main
+log -SF main --max-count=0
+log -SF main --max-count=1
+log -SF main --max-count=2
+log -GF main
+log -GF -p main
+log -GF -p --pickaxe-all main
+log -IA -IB -I1 -I2 -p main
 log --decorate --all
 log --decorate=full --all
 
 rev-list --parents HEAD
 rev-list --children HEAD
 
-whatchanged master
-:noellipses whatchanged master
-whatchanged -p master
-whatchanged --root master
-:noellipses whatchanged --root master
-whatchanged --root -p master
-whatchanged --patch-with-stat master
-whatchanged --root --patch-with-stat master
-whatchanged --root --patch-with-stat --summary master
+whatchanged main
+:noellipses whatchanged main
+whatchanged -p main
+whatchanged --root main
+:noellipses whatchanged --root main
+whatchanged --root -p main
+whatchanged --patch-with-stat main
+whatchanged --root --patch-with-stat main
+whatchanged --root --patch-with-stat --summary main
 # improved by Timo's patch
-whatchanged --root -c --patch-with-stat --summary master
+whatchanged --root -c --patch-with-stat --summary main
 # improved by Timo's patch
-whatchanged --root --cc --patch-with-stat --summary master
-whatchanged -SF master
-:noellipses whatchanged -SF master
-whatchanged -SF -p master
+whatchanged --root --cc --patch-with-stat --summary main
+whatchanged -SF main
+:noellipses whatchanged -SF main
+whatchanged -SF -p main
 
-log --patch-with-stat master -- dir/
-whatchanged --patch-with-stat master -- dir/
-log --patch-with-stat --summary master -- dir/
-whatchanged --patch-with-stat --summary master -- dir/
+log --patch-with-stat main -- dir/
+whatchanged --patch-with-stat main -- dir/
+log --patch-with-stat --summary main -- dir/
+whatchanged --patch-with-stat --summary main -- dir/
 
 show initial
 show --root initial
 show side
-show master
-show -c master
-show -m master
-show --first-parent master
+show main
+show -c main
+show -m main
+show --first-parent main
 show --stat side
 show --stat --summary side
 show --patch-with-stat side
@@ -378,22 +381,22 @@ show --patch-with-raw side
 show --patch-with-stat --summary side
 
 format-patch --stdout initial..side
-format-patch --stdout initial..master^
-format-patch --stdout initial..master
-format-patch --stdout --no-numbered initial..master
-format-patch --stdout --numbered initial..master
+format-patch --stdout initial..main^
+format-patch --stdout initial..main
+format-patch --stdout --no-numbered initial..main
+format-patch --stdout --numbered initial..main
 format-patch --attach --stdout initial..side
 format-patch --attach --stdout --suffix=.diff initial..side
-format-patch --attach --stdout initial..master^
-format-patch --attach --stdout initial..master
+format-patch --attach --stdout initial..main^
+format-patch --attach --stdout initial..main
 format-patch --inline --stdout initial..side
-format-patch --inline --stdout initial..master^
-format-patch --inline --stdout --numbered-files initial..master
-format-patch --inline --stdout initial..master
-format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
+format-patch --inline --stdout initial..main^
+format-patch --inline --stdout --numbered-files initial..main
+format-patch --inline --stdout initial..main
+format-patch --inline --stdout --subject-prefix=TESTCASE initial..main
 config format.subjectprefix DIFFERENT_PREFIX
-format-patch --inline --stdout initial..master^^
-format-patch --stdout --cover-letter -n initial..master^
+format-patch --inline --stdout initial..main^^
+format-patch --stdout --cover-letter -n initial..main^
 
 diff --abbrev initial..side
 diff -U initial..side
@@ -412,13 +415,13 @@ diff --name-status dir2 dir
 diff --no-index --name-status dir2 dir
 diff --no-index --name-status -- dir2 dir
 diff --no-index dir dir3
-diff master master^ side
+diff main main^ side
 # Can't use spaces...
-diff --line-prefix=abc master master^ side
-diff --dirstat master~1 master~2
+diff --line-prefix=abc main main^ side
+diff --dirstat main~1 main~2
 diff --dirstat initial rearrange
 diff --dirstat-by-file initial rearrange
-diff --dirstat --cc master~1 master
+diff --dirstat --cc main~1 main
 # No-index --abbrev and --no-abbrev
 diff --raw initial
 :noellipses diff --raw initial
@@ -471,12 +474,12 @@ test_expect_success 'diff-tree --stdin with log formatting' '
 	Third
 	Second
 	EOF
-	git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
+	git rev-list main | git diff-tree --stdin --format=%s -s >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'diff -I<regex>: setup' '
-	git checkout master &&
+	git checkout main &&
 	test_seq 50 >file0 &&
 	git commit -m "Set up -I<regex> test file" file0 &&
 	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
similarity index 86%
rename from t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
rename to t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
index 9951e3677d..af1cf20f4c 100644
--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
@@ -1,4 +1,4 @@
-$ git diff-tree --cc --patch-with-stat --summary master
+$ git diff-tree --cc --patch-with-stat --summary main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
similarity index 89%
rename from t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
rename to t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
index db3c0a7b2c..0ec6042097 100644
--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
@@ -1,4 +1,4 @@
-$ git diff-tree --cc --patch-with-stat master
+$ git diff-tree --cc --patch-with-stat main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.diff-tree_--cc_--shortstat_master b/t/t4013/diff.diff-tree_--cc_--shortstat_main
similarity index 65%
rename from t/t4013/diff.diff-tree_--cc_--shortstat_master
rename to t/t4013/diff.diff-tree_--cc_--shortstat_main
index a4ca42df2a..9a4ef03197 100644
--- a/t/t4013/diff.diff-tree_--cc_--shortstat_master
+++ b/t/t4013/diff.diff-tree_--cc_--shortstat_main
@@ -1,4 +1,4 @@
-$ git diff-tree --cc --shortstat master
+$ git diff-tree --cc --shortstat main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
  2 files changed, 5 insertions(+)
 $
diff --git a/t/t4013/diff.diff-tree_-c_--stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--stat_--summary_main
similarity index 71%
rename from t/t4013/diff.diff-tree_-c_--stat_--summary_master
rename to t/t4013/diff.diff-tree_--cc_--stat_--summary_main
index 81c3021541..9db08a4aa9 100644
--- a/t/t4013/diff.diff-tree_-c_--stat_--summary_master
+++ b/t/t4013/diff.diff-tree_--cc_--stat_--summary_main
@@ -1,4 +1,4 @@
-$ git diff-tree -c --stat --summary master
+$ git diff-tree --cc --stat --summary main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.diff-tree_-c_--stat_master b/t/t4013/diff.diff-tree_--cc_--stat_main
similarity index 76%
rename from t/t4013/diff.diff-tree_-c_--stat_master
rename to t/t4013/diff.diff-tree_--cc_--stat_main
index 89d59b1548..7ecc67a524 100644
--- a/t/t4013/diff.diff-tree_-c_--stat_master
+++ b/t/t4013/diff.diff-tree_--cc_--stat_main
@@ -1,4 +1,4 @@
-$ git diff-tree -c --stat master
+$ git diff-tree --cc --stat main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.diff-tree_--cc_master b/t/t4013/diff.diff-tree_--cc_main
similarity index 91%
rename from t/t4013/diff.diff-tree_--cc_master
rename to t/t4013/diff.diff-tree_--cc_main
index 5ecb4e14ae..1a962856ad 100644
--- a/t/t4013/diff.diff-tree_--cc_master
+++ b/t/t4013/diff.diff-tree_--cc_main
@@ -1,4 +1,4 @@
-$ git diff-tree --cc master
+$ git diff-tree --cc main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 diff --cc dir/sub
 index cead32e,7289e35..992913c
diff --git a/t/t4013/diff.diff-tree_-c_--abbrev_master b/t/t4013/diff.diff-tree_-c_--abbrev_main
similarity index 83%
rename from t/t4013/diff.diff-tree_-c_--abbrev_master
rename to t/t4013/diff.diff-tree_-c_--abbrev_main
index b8e4aa2530..039d127cf2 100644
--- a/t/t4013/diff.diff-tree_-c_--abbrev_master
+++ b/t/t4013/diff.diff-tree_-c_--abbrev_main
@@ -1,4 +1,4 @@
-$ git diff-tree -c --abbrev master
+$ git diff-tree -c --abbrev main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 ::100644 100644 100644 cead32e... 7289e35... 992913c... MM	dir/sub
 ::100644 100644 100644 b414108... f4615da... 10a8a9f... MM	file0
diff --git a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master b/t/t4013/diff.diff-tree_-c_--stat_--summary_main
similarity index 70%
rename from t/t4013/diff.diff-tree_--cc_--stat_--summary_master
rename to t/t4013/diff.diff-tree_-c_--stat_--summary_main
index d019867dd9..05a8d16ba7 100644
--- a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master
+++ b/t/t4013/diff.diff-tree_-c_--stat_--summary_main
@@ -1,4 +1,4 @@
-$ git diff-tree --cc --stat --summary master
+$ git diff-tree -c --stat --summary main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.diff-tree_--cc_--stat_master b/t/t4013/diff.diff-tree_-c_--stat_main
similarity index 75%
rename from t/t4013/diff.diff-tree_--cc_--stat_master
rename to t/t4013/diff.diff-tree_-c_--stat_main
index 40b91796b3..61d9f450df 100644
--- a/t/t4013/diff.diff-tree_--cc_--stat_master
+++ b/t/t4013/diff.diff-tree_-c_--stat_main
@@ -1,4 +1,4 @@
-$ git diff-tree --cc --stat master
+$ git diff-tree -c --stat main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
  dir/sub | 2 ++
  file0   | 3 +++
diff --git a/t/t4013/diff.diff-tree_-c_master b/t/t4013/diff.diff-tree_-c_main
similarity index 93%
rename from t/t4013/diff.diff-tree_-c_master
rename to t/t4013/diff.diff-tree_-c_main
index e2d2bb2611..a84e1185cf 100644
--- a/t/t4013/diff.diff-tree_-c_master
+++ b/t/t4013/diff.diff-tree_-c_main
@@ -1,4 +1,4 @@
-$ git diff-tree -c master
+$ git diff-tree -c main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 ::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM	dir/sub
 ::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM	file0
diff --git a/t/t4013/diff.diff-tree_-p_-m_master b/t/t4013/diff.diff-tree_-p_-m_main
similarity index 97%
rename from t/t4013/diff.diff-tree_-p_-m_master
rename to t/t4013/diff.diff-tree_-p_-m_main
index b60bea039d..29c9fc20b8 100644
--- a/t/t4013/diff.diff-tree_-p_-m_master
+++ b/t/t4013/diff.diff-tree_-p_-m_main
@@ -1,4 +1,4 @@
-$ git diff-tree -p -m master
+$ git diff-tree -p -m main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644
diff --git a/t/t4013/diff.diff-tree_-p_main b/t/t4013/diff.diff-tree_-p_main
new file mode 100644
index 0000000000..c658062422
--- /dev/null
+++ b/t/t4013/diff.diff-tree_-p_main
@@ -0,0 +1,2 @@
+$ git diff-tree -p main
+$
diff --git a/t/t4013/diff.diff-tree_-p_master b/t/t4013/diff.diff-tree_-p_master
deleted file mode 100644
index b182875fb2..0000000000
--- a/t/t4013/diff.diff-tree_-p_master
+++ /dev/null
@@ -1,2 +0,0 @@
-$ git diff-tree -p master
-$
diff --git a/t/t4013/diff.diff-tree_main b/t/t4013/diff.diff-tree_main
new file mode 100644
index 0000000000..dc5b9fdeb6
--- /dev/null
+++ b/t/t4013/diff.diff-tree_main
@@ -0,0 +1,2 @@
+$ git diff-tree main
+$
diff --git a/t/t4013/diff.diff-tree_master b/t/t4013/diff.diff-tree_master
deleted file mode 100644
index fe9226f8a1..0000000000
--- a/t/t4013/diff.diff-tree_master
+++ /dev/null
@@ -1,2 +0,0 @@
-$ git diff-tree master
-$
diff --git a/t/t4013/diff.diff_--dirstat_--cc_main~1_main b/t/t4013/diff.diff_--dirstat_--cc_main~1_main
new file mode 100644
index 0000000000..168a357a02
--- /dev/null
+++ b/t/t4013/diff.diff_--dirstat_--cc_main~1_main
@@ -0,0 +1,3 @@
+$ git diff --dirstat --cc main~1 main
+  40.0% dir/
+$
diff --git a/t/t4013/diff.diff_--dirstat_--cc_master~1_master b/t/t4013/diff.diff_--dirstat_--cc_master~1_master
deleted file mode 100644
index fba4e34175..0000000000
--- a/t/t4013/diff.diff_--dirstat_--cc_master~1_master
+++ /dev/null
@@ -1,3 +0,0 @@
-$ git diff --dirstat --cc master~1 master
-  40.0% dir/
-$
diff --git a/t/t4013/diff.diff_--dirstat_main~1_main~2 b/t/t4013/diff.diff_--dirstat_main~1_main~2
new file mode 100644
index 0000000000..6809733708
--- /dev/null
+++ b/t/t4013/diff.diff_--dirstat_main~1_main~2
@@ -0,0 +1,3 @@
+$ git diff --dirstat main~1 main~2
+  40.0% dir/
+$
diff --git a/t/t4013/diff.diff_--dirstat_master~1_master~2 b/t/t4013/diff.diff_--dirstat_master~1_master~2
deleted file mode 100644
index b672e1ca63..0000000000
--- a/t/t4013/diff.diff_--dirstat_master~1_master~2
+++ /dev/null
@@ -1,3 +0,0 @@
-$ git diff --dirstat master~1 master~2
-  40.0% dir/
-$
diff --git a/t/t4013/diff.diff_--line-prefix=abc_master_master^_side b/t/t4013/diff.diff_--line-prefix=abc_main_main^_side
similarity index 87%
rename from t/t4013/diff.diff_--line-prefix=abc_master_master^_side
rename to t/t4013/diff.diff_--line-prefix=abc_main_main^_side
index 99f91e7f0e..67a2145a36 100644
--- a/t/t4013/diff.diff_--line-prefix=abc_master_master^_side
+++ b/t/t4013/diff.diff_--line-prefix=abc_main_main^_side
@@ -1,4 +1,4 @@
-$ git diff --line-prefix=abc master master^ side
+$ git diff --line-prefix=abc main main^ side
 abcdiff --cc dir/sub
 abcindex cead32e,7289e35..992913c
 abc--- a/dir/sub
diff --git a/t/t4013/diff.diff_master_master^_side b/t/t4013/diff.diff_main_main^_side
similarity index 89%
rename from t/t4013/diff.diff_master_master^_side
rename to t/t4013/diff.diff_main_main^_side
index 50ec9cadd6..ab81ec9e47 100644
--- a/t/t4013/diff.diff_master_master^_side
+++ b/t/t4013/diff.diff_main_main^_side
@@ -1,4 +1,4 @@
-$ git diff master master^ side
+$ git diff main main^ side
 diff --cc dir/sub
 index cead32e,7289e35..992913c
 --- a/dir/sub
diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/t/t4013/diff.format-patch_--attach_--stdout_initial..main
similarity index 98%
rename from t/t4013/diff.format-patch_--attach_--stdout_initial..master
rename to t/t4013/diff.format-patch_--attach_--stdout_initial..main
index 52fedc179e..9f56380350 100644
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main
@@ -1,4 +1,4 @@
-$ git format-patch --attach --stdout initial..master
+$ git format-patch --attach --stdout initial..main
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main^
similarity index 97%
rename from t/t4013/diff.format-patch_--attach_--stdout_initial..master^
rename to t/t4013/diff.format-patch_--attach_--stdout_initial..main^
index 1c3cde251b..80132ea99e 100644
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main^
@@ -1,4 +1,4 @@
-$ git format-patch --attach --stdout initial..master^
+$ git format-patch --attach --stdout initial..main^
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
similarity index 99%
rename from t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
rename to t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
index 02c4db7ec5..8e889090fb 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
+++ b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
@@ -1,4 +1,4 @@
-$ git format-patch --inline --stdout --numbered-files initial..master
+$ git format-patch --inline --stdout --numbered-files initial..main
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
similarity index 99%
rename from t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
rename to t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
index c7677c5951..d7d2b12d15 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
+++ b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
@@ -1,4 +1,4 @@
-$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
+$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..main
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_initial..main
similarity index 98%
rename from t/t4013/diff.format-patch_--inline_--stdout_initial..master
rename to t/t4013/diff.format-patch_--inline_--stdout_initial..main
index 5b3e34e2c0..c49c423f82 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main
@@ -1,4 +1,4 @@
-$ git format-patch --inline --stdout initial..master
+$ git format-patch --inline --stdout initial..main
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^
similarity index 97%
rename from t/t4013/diff.format-patch_--inline_--stdout_initial..master^
rename to t/t4013/diff.format-patch_--inline_--stdout_initial..main^
index d13f8a8128..8669dbfe6c 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^
@@ -1,4 +1,4 @@
-$ git format-patch --inline --stdout initial..master^
+$ git format-patch --inline --stdout initial..main^
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
similarity index 95%
rename from t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
rename to t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
index caec5537de..b749be58b0 100644
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
@@ -1,4 +1,4 @@
-$ git format-patch --inline --stdout initial..master^^
+$ git format-patch --inline --stdout initial..main^^
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
similarity index 96%
rename from t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
rename to t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
index 244d964fc6..567f222198 100644
--- a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
+++ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
@@ -1,4 +1,4 @@
-$ git format-patch --stdout --cover-letter -n initial..master^
+$ git format-patch --stdout --cover-letter -n initial..main^
 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
 From: C O Mitter <committer@example.com>
 Date: Mon, 26 Jun 2006 00:06:00 +0000
diff --git a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
similarity index 97%
rename from t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
rename to t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
index bfc287a147..195b62ea4f 100644
--- a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
+++ b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
@@ -1,4 +1,4 @@
-$ git format-patch --stdout --no-numbered initial..master
+$ git format-patch --stdout --no-numbered initial..main
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--numbered_initial..main
similarity index 97%
rename from t/t4013/diff.format-patch_--stdout_--numbered_initial..master
rename to t/t4013/diff.format-patch_--stdout_--numbered_initial..main
index 568f6f584e..0678a38515 100644
--- a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master
+++ b/t/t4013/diff.format-patch_--stdout_--numbered_initial..main
@@ -1,4 +1,4 @@
-$ git format-patch --stdout --numbered initial..master
+$ git format-patch --stdout --numbered initial..main
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..main
similarity index 97%
rename from t/t4013/diff.format-patch_--stdout_initial..master
rename to t/t4013/diff.format-patch_--stdout_initial..main
index 5f0352f9f7..b4a6302e7c 100644
--- a/t/t4013/diff.format-patch_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--stdout_initial..main
@@ -1,4 +1,4 @@
-$ git format-patch --stdout initial..master
+$ git format-patch --stdout initial..main
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..main^
similarity index 96%
rename from t/t4013/diff.format-patch_--stdout_initial..master^
rename to t/t4013/diff.format-patch_--stdout_initial..main^
index 2ae454d807..36b3221582 100644
--- a/t/t4013/diff.format-patch_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--stdout_initial..main^
@@ -1,4 +1,4 @@
-$ git format-patch --stdout initial..master^
+$ git format-patch --stdout initial..main^
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index 3f9b872ece..7cfd2ea22d 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -26,7 +26,7 @@ Date:   Mon Jun 26 00:06:00 2006 +0000
 
     Notes added by 'git notes add'
 
-commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master)
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/main)
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index f5e20e1e14..735f1aa83c 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -26,7 +26,7 @@ Date:   Mon Jun 26 00:06:00 2006 +0000
 
     Notes added by 'git notes add'
 
-commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master)
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> main)
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
diff --git a/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
similarity index 95%
rename from t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
rename to t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
index 597002232e..fe180fda3b 100644
--- a/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
+++ b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
@@ -1,4 +1,4 @@
-$ git log --no-diff-merges -p --first-parent master
+$ git log --diff-merges=off -p --first-parent main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
similarity index 95%
rename from t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
rename to t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
index 5d7461a167..dca62d4e60 100644
--- a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
+++ b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
@@ -1,4 +1,4 @@
-$ git log --first-parent --diff-merges=off -p master
+$ git log --first-parent --diff-merges=off -p main
 commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
similarity index 95%
rename from t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
rename to t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
index 194e893c94..0b54118088 100644
--- a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
+++ b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
@@ -1,4 +1,4 @@
-$ git log --diff-merges=off -p --first-parent master
+$ git log --no-diff-merges -p --first-parent main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
similarity index 96%
rename from t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
rename to t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
index a18f1472a9..3ed46cc867 100644
--- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
@@ -1,4 +1,4 @@
-$ git log --patch-with-stat --summary master -- dir/
+$ git log --patch-with-stat --summary main -- dir/
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_main
similarity index 98%
rename from t/t4013/diff.log_--patch-with-stat_master
rename to t/t4013/diff.log_--patch-with-stat_main
index ae425c4672..2e12b557cb 100644
--- a/t/t4013/diff.log_--patch-with-stat_master
+++ b/t/t4013/diff.log_--patch-with-stat_main
@@ -1,4 +1,4 @@
-$ git log --patch-with-stat master
+$ git log --patch-with-stat main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_main_--_dir_
similarity index 96%
rename from t/t4013/diff.log_--patch-with-stat_master_--_dir_
rename to t/t4013/diff.log_--patch-with-stat_main_--_dir_
index d5207cadf4..d511ea7f6b 100644
--- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_main_--_dir_
@@ -1,4 +1,4 @@
-$ git log --patch-with-stat master -- dir/
+$ git log --patch-with-stat main -- dir/
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
similarity index 98%
rename from t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
rename to t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
index 0fc1e8cd71..3cfd0e6422 100644
--- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
@@ -1,4 +1,4 @@
-$ git log --root --cc --patch-with-stat --summary master
+$ git log --root --cc --patch-with-stat --summary main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_main
similarity index 98%
rename from t/t4013/diff.log_--root_--patch-with-stat_--summary_master
rename to t/t4013/diff.log_--root_--patch-with-stat_--summary_main
index dffc09dde9..9f4d6dfa44 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_main
@@ -1,4 +1,4 @@
-$ git log --root --patch-with-stat --summary master
+$ git log --root --patch-with-stat --summary main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_main
similarity index 98%
rename from t/t4013/diff.log_--root_--patch-with-stat_master
rename to t/t4013/diff.log_--root_--patch-with-stat_main
index 55aa98012d..0d69ae2e11 100644
--- a/t/t4013/diff.log_--root_--patch-with-stat_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_main
@@ -1,4 +1,4 @@
-$ git log --root --patch-with-stat master
+$ git log --root --patch-with-stat main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
similarity index 98%
rename from t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
rename to t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
index 019d85f7de..1b71add9de 100644
--- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
@@ -1,4 +1,4 @@
-$ git log --root -c --patch-with-stat --summary master
+$ git log --root -c --patch-with-stat --summary main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_main
similarity index 98%
rename from t/t4013/diff.log_--root_-p_master
rename to t/t4013/diff.log_--root_-p_main
index b42c334439..04581296ed 100644
--- a/t/t4013/diff.log_--root_-p_master
+++ b/t/t4013/diff.log_--root_-p_main
@@ -1,4 +1,4 @@
-$ git log --root -p master
+$ git log --root -p main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_main
similarity index 96%
rename from t/t4013/diff.log_--root_master
rename to t/t4013/diff.log_--root_main
index e8f46159da..d5e90fd6b4 100644
--- a/t/t4013/diff.log_--root_master
+++ b/t/t4013/diff.log_--root_main
@@ -1,4 +1,4 @@
-$ git log --root master
+$ git log --root main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-GF_-p_--pickaxe-all_master b/t/t4013/diff.log_-GF_-p_--pickaxe-all_main
similarity index 90%
rename from t/t4013/diff.log_-GF_-p_--pickaxe-all_master
rename to t/t4013/diff.log_-GF_-p_--pickaxe-all_main
index d36f88098b..1f7a497c2d 100644
--- a/t/t4013/diff.log_-GF_-p_--pickaxe-all_master
+++ b/t/t4013/diff.log_-GF_-p_--pickaxe-all_main
@@ -1,4 +1,4 @@
-$ git log -GF -p --pickaxe-all master
+$ git log -GF -p --pickaxe-all main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.log_-GF_-p_master b/t/t4013/diff.log_-GF_-p_main
similarity index 91%
rename from t/t4013/diff.log_-GF_-p_master
rename to t/t4013/diff.log_-GF_-p_main
index 9d93f2c23a..c80dda41e9 100644
--- a/t/t4013/diff.log_-GF_-p_master
+++ b/t/t4013/diff.log_-GF_-p_main
@@ -1,4 +1,4 @@
-$ git log -GF -p master
+$ git log -GF -p main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.log_-SF_master b/t/t4013/diff.log_-GF_main
similarity index 86%
rename from t/t4013/diff.log_-SF_master
rename to t/t4013/diff.log_-GF_main
index c1599f2f52..b94a7f7839 100644
--- a/t/t4013/diff.log_-SF_master
+++ b/t/t4013/diff.log_-GF_main
@@ -1,4 +1,4 @@
-$ git log -SF master
+$ git log -GF main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
similarity index 97%
rename from t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
rename to t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
index 929f35a05b..67e26b4e54 100644
--- a/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
+++ b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
@@ -1,4 +1,4 @@
-$ git log -IA -IB -I1 -I2 -p master
+$ git log -IA -IB -I1 -I2 -p main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-SF_-p_master b/t/t4013/diff.log_-SF_-p_main
similarity index 91%
rename from t/t4013/diff.log_-SF_-p_master
rename to t/t4013/diff.log_-SF_-p_main
index 5e32438972..fa82ac1490 100644
--- a/t/t4013/diff.log_-SF_-p_master
+++ b/t/t4013/diff.log_-SF_-p_main
@@ -1,4 +1,4 @@
-$ git log -SF -p master
+$ git log -SF -p main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.log_-GF_master b/t/t4013/diff.log_-SF_main
similarity index 86%
rename from t/t4013/diff.log_-GF_master
rename to t/t4013/diff.log_-SF_main
index 4c6708d2d0..dbf770db49 100644
--- a/t/t4013/diff.log_-GF_master
+++ b/t/t4013/diff.log_-SF_main
@@ -1,4 +1,4 @@
-$ git log -GF master
+$ git log -SF main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.log_-SF_main_--max-count=0 b/t/t4013/diff.log_-SF_main_--max-count=0
new file mode 100644
index 0000000000..683b17eb99
--- /dev/null
+++ b/t/t4013/diff.log_-SF_main_--max-count=0
@@ -0,0 +1,2 @@
+$ git log -SF main --max-count=0
+$
diff --git a/t/t4013/diff.log_-SF_master_--max-count=2 b/t/t4013/diff.log_-SF_main_--max-count=1
similarity index 79%
rename from t/t4013/diff.log_-SF_master_--max-count=2
rename to t/t4013/diff.log_-SF_main_--max-count=1
index a6c55fd482..2102426f8c 100644
--- a/t/t4013/diff.log_-SF_master_--max-count=2
+++ b/t/t4013/diff.log_-SF_main_--max-count=1
@@ -1,4 +1,4 @@
-$ git log -SF master --max-count=2
+$ git log -SF main --max-count=1
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.log_-SF_main_--max-count=2 b/t/t4013/diff.log_-SF_main_--max-count=2
new file mode 100644
index 0000000000..23e12a4cbb
--- /dev/null
+++ b/t/t4013/diff.log_-SF_main_--max-count=2
@@ -0,0 +1,7 @@
+$ git log -SF main --max-count=2
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+$
diff --git a/t/t4013/diff.log_-SF_master_--max-count=0 b/t/t4013/diff.log_-SF_master_--max-count=0
deleted file mode 100644
index c1fc6c8731..0000000000
--- a/t/t4013/diff.log_-SF_master_--max-count=0
+++ /dev/null
@@ -1,2 +0,0 @@
-$ git log -SF master --max-count=0
-$
diff --git a/t/t4013/diff.log_-SF_master_--max-count=1 b/t/t4013/diff.log_-SF_master_--max-count=1
deleted file mode 100644
index c981a03814..0000000000
--- a/t/t4013/diff.log_-SF_master_--max-count=1
+++ /dev/null
@@ -1,7 +0,0 @@
-$ git log -SF master --max-count=1
-commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
-Author: A U Thor <author@example.com>
-Date:   Mon Jun 26 00:02:00 2006 +0000
-
-    Third
-$
diff --git a/t/t4013/diff.log_-S_F_master b/t/t4013/diff.log_-S_F_main
similarity index 86%
rename from t/t4013/diff.log_-S_F_master
rename to t/t4013/diff.log_-S_F_main
index 978d2b4118..a75a42e143 100644
--- a/t/t4013/diff.log_-S_F_master
+++ b/t/t4013/diff.log_-S_F_main
@@ -1,4 +1,4 @@
-$ git log -S F master
+$ git log -S F main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_main
similarity index 97%
rename from t/t4013/diff.log_-m_-p_--first-parent_master
rename to t/t4013/diff.log_-m_-p_--first-parent_main
index 7a0073f529..459e10786b 100644
--- a/t/t4013/diff.log_-m_-p_--first-parent_master
+++ b/t/t4013/diff.log_-m_-p_--first-parent_main
@@ -1,4 +1,4 @@
-$ git log -m -p --first-parent master
+$ git log -m -p --first-parent main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_main
similarity index 99%
rename from t/t4013/diff.log_-m_-p_master
rename to t/t4013/diff.log_-m_-p_main
index 9ca62a01ed..07453c5698 100644
--- a/t/t4013/diff.log_-m_-p_master
+++ b/t/t4013/diff.log_-m_-p_main
@@ -1,4 +1,4 @@
-$ git log -m -p master
+$ git log -m -p main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_main
similarity index 97%
rename from t/t4013/diff.log_-p_--first-parent_master
rename to t/t4013/diff.log_-p_--first-parent_main
index 28840ebea1..247980817b 100644
--- a/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_main
@@ -1,4 +1,4 @@
-$ git log -p --first-parent master
+$ git log -p --first-parent main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_main
similarity index 98%
rename from t/t4013/diff.log_-p_master
rename to t/t4013/diff.log_-p_main
index bf1326dc36..c82b4dbf16 100644
--- a/t/t4013/diff.log_-p_master
+++ b/t/t4013/diff.log_-p_main
@@ -1,4 +1,4 @@
-$ git log -p master
+$ git log -p main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_main
similarity index 97%
rename from t/t4013/diff.log_master
rename to t/t4013/diff.log_main
index a8f6ce5abd..50401f73e6 100644
--- a/t/t4013/diff.log_master
+++ b/t/t4013/diff.log_main
@@ -1,4 +1,4 @@
-$ git log master
+$ git log main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
similarity index 81%
rename from t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
rename to t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
index bb80f013b3..3aa1f80af3 100644
--- a/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
+++ b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
@@ -1,4 +1,4 @@
-$ git diff-tree -c --abbrev master
+$ git diff-tree -c --abbrev main
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 ::100644 100644 100644 cead32e 7289e35 992913c MM	dir/sub
 ::100644 100644 100644 b414108 f4615da 10a8a9f MM	file0
diff --git a/t/t4013/diff.noellipses-whatchanged_--root_master b/t/t4013/diff.noellipses-whatchanged_--root_main
similarity index 96%
rename from t/t4013/diff.noellipses-whatchanged_--root_master
rename to t/t4013/diff.noellipses-whatchanged_--root_main
index c2cfd4e729..2bec055835 100644
--- a/t/t4013/diff.noellipses-whatchanged_--root_master
+++ b/t/t4013/diff.noellipses-whatchanged_--root_main
@@ -1,4 +1,4 @@
-$ git whatchanged --root master
+$ git whatchanged --root main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.noellipses-whatchanged_-SF_master b/t/t4013/diff.noellipses-whatchanged_-SF_main
similarity index 86%
rename from t/t4013/diff.noellipses-whatchanged_-SF_master
rename to t/t4013/diff.noellipses-whatchanged_-SF_main
index b36ce5886e..0c1476d19e 100644
--- a/t/t4013/diff.noellipses-whatchanged_-SF_master
+++ b/t/t4013/diff.noellipses-whatchanged_-SF_main
@@ -1,4 +1,4 @@
-$ git whatchanged -SF master
+$ git whatchanged -SF main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.noellipses-whatchanged_master b/t/t4013/diff.noellipses-whatchanged_main
similarity index 96%
rename from t/t4013/diff.noellipses-whatchanged_master
rename to t/t4013/diff.noellipses-whatchanged_main
index 55e500f2ed..c48d2851aa 100644
--- a/t/t4013/diff.noellipses-whatchanged_master
+++ b/t/t4013/diff.noellipses-whatchanged_main
@@ -1,4 +1,4 @@
-$ git whatchanged master
+$ git whatchanged main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.show_--first-parent_master b/t/t4013/diff.show_--first-parent_main
similarity index 92%
rename from t/t4013/diff.show_--first-parent_master
rename to t/t4013/diff.show_--first-parent_main
index 3dcbe473a0..480502d65c 100644
--- a/t/t4013/diff.show_--first-parent_master
+++ b/t/t4013/diff.show_--first-parent_main
@@ -1,4 +1,4 @@
-$ git show --first-parent master
+$ git show --first-parent main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_main
similarity index 95%
rename from t/t4013/diff.show_-c_master
rename to t/t4013/diff.show_-c_main
index 81aba8da96..74ef8bc96b 100644
--- a/t/t4013/diff.show_-c_master
+++ b/t/t4013/diff.show_-c_main
@@ -1,4 +1,4 @@
-$ git show -c master
+$ git show -c main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.show_-m_master b/t/t4013/diff.show_-m_main
similarity index 98%
rename from t/t4013/diff.show_-m_master
rename to t/t4013/diff.show_-m_main
index 4ea2ee453d..8fd56736d9 100644
--- a/t/t4013/diff.show_-m_master
+++ b/t/t4013/diff.show_-m_main
@@ -1,4 +1,4 @@
-$ git show -m master
+$ git show -m main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_main
similarity index 96%
rename from t/t4013/diff.show_master
rename to t/t4013/diff.show_main
index fb08ce0e46..630b52a95e 100644
--- a/t/t4013/diff.show_master
+++ b/t/t4013/diff.show_main
@@ -1,4 +1,4 @@
-$ git show master
+$ git show main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
similarity index 94%
rename from t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
rename to t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
index c8b6af2f43..ce0754d556 100644
--- a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
+++ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
@@ -1,4 +1,4 @@
-$ git whatchanged --patch-with-stat --summary master -- dir/
+$ git whatchanged --patch-with-stat --summary main -- dir/
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master b/t/t4013/diff.whatchanged_--patch-with-stat_main
similarity index 97%
rename from t/t4013/diff.whatchanged_--patch-with-stat_master
rename to t/t4013/diff.whatchanged_--patch-with-stat_main
index 1ac431ba92..aabccf39a5 100644
--- a/t/t4013/diff.whatchanged_--patch-with-stat_master
+++ b/t/t4013/diff.whatchanged_--patch-with-stat_main
@@ -1,4 +1,4 @@
-$ git whatchanged --patch-with-stat master
+$ git whatchanged --patch-with-stat main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
similarity index 94%
rename from t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
rename to t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
index b30c28588f..c05a0e8149 100644
--- a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
+++ b/t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
@@ -1,4 +1,4 @@
-$ git whatchanged --patch-with-stat master -- dir/
+$ git whatchanged --patch-with-stat main -- dir/
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
similarity index 97%
rename from t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
rename to t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
index 30aae7817b..1f74b1b548 100644
--- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
@@ -1,4 +1,4 @@
-$ git whatchanged --root --cc --patch-with-stat --summary master
+$ git whatchanged --root --cc --patch-with-stat --summary main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
similarity index 97%
rename from t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
rename to t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
index db90e51525..80d9812151 100644
--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
@@ -1,4 +1,4 @@
-$ git whatchanged --root --patch-with-stat --summary master
+$ git whatchanged --root --patch-with-stat --summary main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_main
similarity index 97%
rename from t/t4013/diff.whatchanged_--root_--patch-with-stat_master
rename to t/t4013/diff.whatchanged_--root_--patch-with-stat_main
index 9a6cc92ce7..c0b9082a2c 100644
--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master
+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_main
@@ -1,4 +1,4 @@
-$ git whatchanged --root --patch-with-stat master
+$ git whatchanged --root --patch-with-stat main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
similarity index 97%
rename from t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
rename to t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
index d1d32bd34c..0002c6912e 100644
--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
@@ -1,4 +1,4 @@
-$ git whatchanged --root -c --patch-with-stat --summary master
+$ git whatchanged --root -c --patch-with-stat --summary main
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.whatchanged_--root_-p_master b/t/t4013/diff.whatchanged_--root_-p_main
similarity index 98%
rename from t/t4013/diff.whatchanged_--root_-p_master
rename to t/t4013/diff.whatchanged_--root_-p_main
index ebf1f0661e..39f3e2be74 100644
--- a/t/t4013/diff.whatchanged_--root_-p_master
+++ b/t/t4013/diff.whatchanged_--root_-p_main
@@ -1,4 +1,4 @@
-$ git whatchanged --root -p master
+$ git whatchanged --root -p main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_--root_master b/t/t4013/diff.whatchanged_--root_main
similarity index 97%
rename from t/t4013/diff.whatchanged_--root_master
rename to t/t4013/diff.whatchanged_--root_main
index a405cb6138..36f4d6697f 100644
--- a/t/t4013/diff.whatchanged_--root_master
+++ b/t/t4013/diff.whatchanged_--root_main
@@ -1,4 +1,4 @@
-$ git whatchanged --root master
+$ git whatchanged --root main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_-SF_-p_master b/t/t4013/diff.whatchanged_-SF_-p_main
similarity index 89%
rename from t/t4013/diff.whatchanged_-SF_-p_master
rename to t/t4013/diff.whatchanged_-SF_-p_main
index f39da84822..0e2e67c0df 100644
--- a/t/t4013/diff.whatchanged_-SF_-p_master
+++ b/t/t4013/diff.whatchanged_-SF_-p_main
@@ -1,4 +1,4 @@
-$ git whatchanged -SF -p master
+$ git whatchanged -SF -p main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_-SF_master b/t/t4013/diff.whatchanged_-SF_main
similarity index 86%
rename from t/t4013/diff.whatchanged_-SF_master
rename to t/t4013/diff.whatchanged_-SF_main
index 0499321d0e..34c6bf6b95 100644
--- a/t/t4013/diff.whatchanged_-SF_master
+++ b/t/t4013/diff.whatchanged_-SF_main
@@ -1,4 +1,4 @@
-$ git whatchanged -SF master
+$ git whatchanged -SF main
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_-p_master b/t/t4013/diff.whatchanged_-p_main
similarity index 98%
rename from t/t4013/diff.whatchanged_-p_master
rename to t/t4013/diff.whatchanged_-p_main
index f18d43209c..18f3bdeef4 100644
--- a/t/t4013/diff.whatchanged_-p_master
+++ b/t/t4013/diff.whatchanged_-p_main
@@ -1,4 +1,4 @@
-$ git whatchanged -p master
+$ git whatchanged -p main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000
diff --git a/t/t4013/diff.whatchanged_master b/t/t4013/diff.whatchanged_main
similarity index 97%
rename from t/t4013/diff.whatchanged_master
rename to t/t4013/diff.whatchanged_main
index cd3bcc2c72..d6c83ed8b0 100644
--- a/t/t4013/diff.whatchanged_master
+++ b/t/t4013/diff.whatchanged_main
@@ -1,4 +1,4 @@
-$ git whatchanged master
+$ git whatchanged main
 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:03:00 2006 +0000

base-commit: 7f7ebe054af6d831b999d6c2241b9227c4e4e08d
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] t4013: prepare for the new default branch name "main"
  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
  0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin @ 2020-11-11 21:43 UTC (permalink / raw)
  To: gitster; +Cc: git, Johannes Schindelin via GitGitGadget

Hi Junio,


On Sun, 8 Nov 2020, Johannes Schindelin via GitGitGadget wrote:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> This patch is a bit involved, mainly because the default branch name is
> not only hard-coded in the script `t4013-diff-various.sh` itself, and
> not only in the support files in `t/t4013/`, but also in the _file
> names_ in `t/t4013/`.
>
> The trick to adjust this test script was performed by inserting the
> definition GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main at the beginning of
> the test script, and then running these commands:
>
> (cd t &&
>  sed -i 's/master/main/g' -- \
> 	$(git grep -l master HEAD -- ./t4013\* | sed 's/HEAD://'))
>
> and
>
> eval "$(git ls-files t/t4013/ | sed -n \
> 	-e 's/\(.*\)master\(.*\)master\(.*\)/git mv & \1main\2main\3;/p')"
>
> and
>
> eval "$(git ls-files t/t4013/ | sed -n \
> 	-e 's/\(.*\)master\(.*\)/git mv & \1main\2;/p')"
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>     t4013: prepare for the new default branch name "main"
>
>     This is yet another big patch in the flurry of patch series on the way
>     to switch the default branch name used by git init to main.
>
>     I pulled this out from js/default-branch-name-part-4-minus-1 because
>     mk/diff-ignore-regex was still in flight, and conflicted with this here
>     patch.
>
>     Unfortunately, in the meantime so/log-diff-merge entered seen, and it
>     conflicts, too. So it seems that I waited a bit too long... sigh. To
>     help move this patch forward (because it blocks quite a few patch series
>     on my side), I based this patch on git/git's master.
>
>     The conflicts are more than mere merge conflicts, of course: the patch
>     renames a couple of files in t/t4013/ and edits those files to replace
>     any mention of master with main. Concretely, these commands were
>     executed:
>
>     (cd t &&
>          sed -i 's/master/main/g' -- $(git grep -l master -- ./t4013\*))
>     eval "$(git ls-files t/t4013/ | sed -n \
>                 -e 's/\(.*\)master\(.*\)master\(.*\)/git mv & \1main\2main\3;/p')"
>     eval "$(git ls-files t/t4013/ | sed -n \
>                 -e 's/\(.*\)master\(.*\)/git mv & \1main\2;/p')"
>
>     In fact, the only thing this patch does on top of the result of those
>     commands is to set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main in t4013.
>
>     I wonder whether it would be better to apply the semantic equivalent of
>     this patch on top of js/default-branch-name-part-4-minus-1, then merge
>     mk/diff-ignore-regex (resolving the conflicts essentially by re-issuing
>     the commands), and then merge so/log-diff-merge. I tried that and pushed
>     it up as the
>     prepare-for-main-branch-t4013-plus-mk/diff-ignore-regex-plus-so/log-diff-merge
>     branch to https://github.com/dscho/git. Unfortunately, so/log-diff-merge
>     branches off from a much later commit in git/git's master than
>     js/default-branch-name-part-4-minus-1, therefore the commit graph of
>     that branch looks a bit messy.
>
>     So I tried another approach: rebasing so/log-diff-merge on top of this
>     here patch, adjusting the patches as needed. The result can be found at
>     https://github.com/dscho/git as
>     prepare-for-main-branch-t4013-plus-adjusted-so/log-diff-merge.

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

The other patch series are mostly even in `master`, only  the following
prerequisites are only in `next` so far:

	js/p4-default-branch
	js/default-branch-name-adjust-t5515
	js/test-whitespace-fixes
	js/test-file-size
	jk/diff-release-filespec-fix
	en/merge-tests
	rs/worktree-list-show-locked
	ds/maintenance-part-4
	ds/maintenance-part-3

There are also conflicts with fc/bash-completion-post-2.29 and as I
mentioned in the quoted email, so/log-diff-merge. I am not quite sure
where those patch series are, and would be happy to help resolve
conflicts between those branches and the default-branch-name patches.

I would love to move forward with switching `init.defaultBranch` to
default to `main`, and I thought that it would be a good time now, well in
advance of the next -rc phase. What are your thoughts on this matter?

Thanks,
Dscho

>     The output of git range-diff e2850a27a95..f4150457c7d
>     ca254612280..3cd3222b22e reads like this:
>
>      1:  8e30afd4140 !  1:  17b198661f6 revision: factor out parsing of diff-merge related options
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## revision.c ##
>          @@ revision.c: static void add_message_grep(struct rev_info *revs, const char *pattern)
>      2:  1f3770bcd09 !  2:  f0de70ab6bd revision: factor out setup of diff-merge related settings
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## revision.c ##
>          @@ revision.c: static int parse_diff_merge_opts(struct rev_info *revs, const char **argv) {
>      3:  acabfff0740 !  3:  3f3d217c3b5 revision: factor out initialization of diff-merge related settings
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## revision.c ##
>          @@ revision.c: static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
>      4:  405aa89dfeb !  4:  3f78fd73e74 revision: provide implementation for diff merges tweaks
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## builtin/log.c ##
>          @@ builtin/log.c: static int show_tree_object(const struct object_id *oid,
>      5:  1ac1179a479 !  5:  574473b8ccb revision: move diff merges functions to its own diff-merges.c
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## Makefile ##
>          @@ Makefile: LIB_OBJS += date.o
>      6:  99043703aff !  6:  7d237cb9df1 diff-merges: rename all functions to have common prefix
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## builtin/log.c ##
>          @@ builtin/log.c: static int show_tree_object(const struct object_id *oid,
>      7:  3ffcf8dd2ac !  7:  95993b629ac diff-merges: move checks for first_parent_only out of the module
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## builtin/log.c ##
>          @@ builtin/log.c: static int show_tree_object(const struct object_id *oid,
>      8:  b14e0c06319 !  8:  4c1897a9f1c diff-merges: rename diff_merges_default_to_enable() to match semantics
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## builtin/log.c ##
>          @@ builtin/log.c: static void show_setup_revisions_tweak(struct rev_info *rev,
>      9:  c3a3db7d41f !  9:  f256249a306 diff-merges: re-arrange functions to match the order they are called in
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@
>     10:  8f260eab8ed ! 10:  31285aa5fb5 diff-merges: new function diff_merges_suppress()
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## builtin/merge.c ##
>          @@
>     11:  820e1f08837 ! 11:  6f7388b2d7c diff-merges: new function diff_merges_set_dense_combined_if_unset()
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## builtin/diff-files.c ##
>          @@
>     12:  c1cd628d982 ! 12:  9e24bee0010 diff-merges: introduce revs->first_parent_merges flag
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@ diff-merges.c: void diff_merges_suppress(struct rev_info *revs) {
>     13:  dac39d0bc1c ! 13:  75d7de500ae diff-merges: revise revs->diff flag handling
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@ diff-merges.c: int diff_merges_parse_opts(struct rev_info *revs, const char **argv) {
>     14:  ead9e513b51 ! 14:  435e5169cfc t4013: support test_expect_failure through ':failure' magic
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## t/t4013-diff-various.sh ##
>          @@ t/t4013-diff-various.sh: process_diffs () {
>     15:  fe299a0b5fa ! 15:  09e575c53ed t4013: add tests for -m failing to override -c/--cc
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## t/t4013-diff-various.sh ##
>         -@@ t/t4013-diff-various.sh: log --first-parent --diff-merges=off -p master
>         - log -p --first-parent master
>         - log -m -p --first-parent master
>         - log -m -p master
>         -+:failure log --cc -m -p master
>         -+:failure log -c -m -p master
>         - log -SF master
>         - log -S F master
>         - log -SF -p master
>         +@@ t/t4013-diff-various.sh: log --first-parent --diff-merges=off -p main
>         + log -p --first-parent main
>         + log -m -p --first-parent main
>         + log -m -p main
>         ++:failure log --cc -m -p main
>         ++:failure log -c -m -p main
>         + log -SF main
>         + log -S F main
>         + log -SF -p main
>         +@@ t/t4013-diff-various.sh: log -SF main --max-count=2
>         + log -GF main
>         + log -GF -p main
>         + log -GF -p --pickaxe-all main
>         +-log -IA -IB -I1 -I2 -p main
>         + log --decorate --all
>         + log --decorate=full --all
>         +
>
>         - ## t/t4013/diff.log_--cc_-m_-p_master (new) ##
>         + ## t/t4013/diff.log_--cc_-m_-p_main (new) ##
>          @@
>         -+$ git log --cc -m -p master
>         ++$ git log --cc -m -p main
>          +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
>          +Merge: 9a6d494 c7a2ab9
>          +Author: A U Thor <author@example.com>
>         @@ -1,3 +0,0 @@
>          +    Initial
>          +$
>
>         - ## t/t4013/diff.log_-c_-m_-p_master (new) ##
>         + ## t/t4013/diff.log_-c_-m_-p_main (new) ##
>          @@
>         -+$ git log -c -m -p master
>         ++$ git log -c -m -p main
>          +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
>          +Merge: 9a6d494 c7a2ab9
>          +Author: A U Thor <author@example.com>
>     16:  1d617dc2d90 <  -:  ----------- diff-merges: fix -m to properly override -c/--cc
>      -:  ----------- > 16:  52f2012a8a8 diff-merges: fix -m to properly override -c/--cc
>     17:  0526b313b86 ! 17:  3417f2fd0e4 diff-merges: split 'ignore_merges' field
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@
>     18:  7f188afab8b ! 18:  ab9b959cf44 diff-merges: group diff-merge flags next to each other inside 'rev_info'
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## revision.h ##
>          @@ revision.h: struct rev_info {
>     19:  38ec10c12a8 ! 19:  328fbd9c650 diff-merges: get rid of now empty diff_merges_init_revs()
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@ diff-merges.c: static void set_dense_combined(struct rev_info *revs) {
>     20:  c85c889ae46 ! 20:  ce20b95e25b diff-merges: refactor opt settings into separate functions
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@ diff-merges.c: static void suppress(struct rev_info *revs) {
>     21:  283182de25d ! 21:  e96a3e193cb diff-merges: make -m/-c/--cc explicitly mutually exclusive
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@ diff-merges.c: static void suppress(struct rev_info *revs) {
>     22:  f80baa896df ! 22:  8ccbb1a002b diff-merges: implement new values for --diff-merges
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## diff-merges.c ##
>          @@ diff-merges.c: static void set_separate(struct rev_info *revs) {
>     23:  551e4dc3a62 ! 23:  92e4f9483cd t4013: add test for --diff-merges=first-parent
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## t/t4013-diff-various.sh ##
>         -@@ t/t4013-diff-various.sh: log --no-diff-merges -p --first-parent master
>         - log --diff-merges=off -p --first-parent master
>         - log --first-parent --diff-merges=off -p master
>         - log -p --first-parent master
>         -+log -p --diff-merges=first-parent master
>         - log -m -p --first-parent master
>         - log -m -p master
>         - log --cc -m -p master
>         +@@ t/t4013-diff-various.sh: log --no-diff-merges -p --first-parent main
>         + log --diff-merges=off -p --first-parent main
>         + log --first-parent --diff-merges=off -p main
>         + log -p --first-parent main
>         ++log -p --diff-merges=first-parent main
>         + log -m -p --first-parent main
>         + log -m -p main
>         + log --cc -m -p main
>
>         - ## t/t4013/diff.log_-p_--diff-merges=first-parent_master (new) ##
>         + ## t/t4013/diff.log_-p_--diff-merges=first-parent_main (new) ##
>          @@
>         -+$ git log -p --diff-merges=first-parent master
>         ++$ git log -p --diff-merges=first-parent main
>          +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>          +Merge: 9a6d494 c7a2ab9
>          +Author: A U Thor <author@example.com>
>     24:  f0eb0eaf605 ! 24:  da78bc75e5e doc/git-log: describe new --diff-merges options
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## Documentation/git-log.txt ##
>          @@ Documentation/git-log.txt: DIFF FORMATTING
>     25:  7178aa87622 ! 25:  906b93dc4bf doc/diff-generate-patch: mention new --diff-merges option
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## Documentation/diff-generate-patch.txt ##
>          @@ Documentation/diff-generate-patch.txt: Combined diff format
>     26:  f4150457c7d ! 26:  3cd3222b22e doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
>         @@ Commit message
>
>              Signed-off-by: Sergey Organov <sorganov@gmail.com>
>              Signed-off-by: Junio C Hamano <gitster@pobox.com>
>         +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
>           ## Documentation/rev-list-options.txt ##
>          @@ Documentation/rev-list-options.txt: parents) and `--max-parents=-1` (negative numbers denote no upper limit).
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-783%2Fdscho%2Fprepare-for-main-branch-t4013-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-783/dscho/prepare-for-main-branch-t4013-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/783
>
>  t/t4013-diff-various.sh                       | 181 +++++++++---------
>  ...ree_--cc_--patch-with-stat_--summary_main} |   2 +-
>  ...iff.diff-tree_--cc_--patch-with-stat_main} |   2 +-
>  ...r => diff.diff-tree_--cc_--shortstat_main} |   2 +-
>  ...diff.diff-tree_--cc_--stat_--summary_main} |   2 +-
>  ...master => diff.diff-tree_--cc_--stat_main} |   2 +-
>  ...e_--cc_master => diff.diff-tree_--cc_main} |   2 +-
>  ...master => diff.diff-tree_-c_--abbrev_main} |   2 +-
>  ...> diff.diff-tree_-c_--stat_--summary_main} |   2 +-
>  ...t_master => diff.diff-tree_-c_--stat_main} |   2 +-
>  ...-tree_-c_master => diff.diff-tree_-c_main} |   2 +-
>  ...-p_-m_master => diff.diff-tree_-p_-m_main} |   2 +-
>  t/t4013/diff.diff-tree_-p_main                |   2 +
>  t/t4013/diff.diff-tree_-p_master              |   2 -
>  t/t4013/diff.diff-tree_main                   |   2 +
>  t/t4013/diff.diff-tree_master                 |   2 -
>  t/t4013/diff.diff_--dirstat_--cc_main~1_main  |   3 +
>  .../diff.diff_--dirstat_--cc_master~1_master  |   3 -
>  t/t4013/diff.diff_--dirstat_main~1_main~2     |   3 +
>  t/t4013/diff.diff_--dirstat_master~1_master~2 |   3 -
>  ...ff.diff_--line-prefix=abc_main_main^_side} |   2 +-
>  ...master^_side => diff.diff_main_main^_side} |   2 +-
>  ...mat-patch_--attach_--stdout_initial..main} |   2 +-
>  ...at-patch_--attach_--stdout_initial..main^} |   2 +-
>  ...e_--stdout_--numbered-files_initial..main} |   2 +-
>  ...t_--subject-prefix=TESTCASE_initial..main} |   2 +-
>  ...mat-patch_--inline_--stdout_initial..main} |   2 +-
>  ...at-patch_--inline_--stdout_initial..main^} |   2 +-
>  ...t-patch_--inline_--stdout_initial..main^^} |   2 +-
>  ...--stdout_--cover-letter_-n_initial..main^} |   2 +-
>  ...atch_--stdout_--no-numbered_initial..main} |   2 +-
>  ...t-patch_--stdout_--numbered_initial..main} |   2 +-
>  ... diff.format-patch_--stdout_initial..main} |   2 +-
>  ...diff.format-patch_--stdout_initial..main^} |   2 +-
>  t/t4013/diff.log_--decorate=full_--all        |   2 +-
>  t/t4013/diff.log_--decorate_--all             |   2 +-
>  ..._--diff-merges=off_-p_--first-parent_main} |   2 +-
>  ..._--first-parent_--diff-merges=off_-p_main} |   2 +-
>  ...g_--no-diff-merges_-p_--first-parent_main} |   2 +-
>  ..._--patch-with-stat_--summary_main_--_dir_} |   2 +-
>  ...master => diff.log_--patch-with-stat_main} |   2 +-
>  ...> diff.log_--patch-with-stat_main_--_dir_} |   2 +-
>  ...oot_--cc_--patch-with-stat_--summary_main} |   2 +-
>  ...g_--root_--patch-with-stat_--summary_main} |   2 +-
>  ...=> diff.log_--root_--patch-with-stat_main} |   2 +-
>  ...-root_-c_--patch-with-stat_--summary_main} |   2 +-
>  ...root_-p_master => diff.log_--root_-p_main} |   2 +-
>  ...log_--root_master => diff.log_--root_main} |   2 +-
>  ...ter => diff.log_-GF_-p_--pickaxe-all_main} |   2 +-
>  ...log_-GF_-p_master => diff.log_-GF_-p_main} |   2 +-
>  ...{diff.log_-SF_master => diff.log_-GF_main} |   2 +-
>  ...aster => diff.log_-IA_-IB_-I1_-I2_-p_main} |   2 +-
>  ...log_-SF_-p_master => diff.log_-SF_-p_main} |   2 +-
>  ...{diff.log_-GF_master => diff.log_-SF_main} |   2 +-
>  t/t4013/diff.log_-SF_main_--max-count=0       |   2 +
>  ...ount=2 => diff.log_-SF_main_--max-count=1} |   2 +-
>  t/t4013/diff.log_-SF_main_--max-count=2       |   7 +
>  t/t4013/diff.log_-SF_master_--max-count=0     |   2 -
>  t/t4013/diff.log_-SF_master_--max-count=1     |   7 -
>  ...iff.log_-S_F_master => diff.log_-S_F_main} |   2 +-
>  ...ter => diff.log_-m_-p_--first-parent_main} |   2 +-
>  ...f.log_-m_-p_master => diff.log_-m_-p_main} |   2 +-
>  ...master => diff.log_-p_--first-parent_main} |   2 +-
>  .../{diff.log_-p_master => diff.log_-p_main}  |   2 +-
>  t/t4013/{diff.log_master => diff.log_main}    |   2 +-
>  ...iff.noellipses-diff-tree_-c_--abbrev_main} |   2 +-
>  ...> diff.noellipses-whatchanged_--root_main} |   2 +-
>  ...r => diff.noellipses-whatchanged_-SF_main} |   2 +-
>  ...aster => diff.noellipses-whatchanged_main} |   2 +-
>  ...t_master => diff.show_--first-parent_main} |   2 +-
>  ...{diff.show_-c_master => diff.show_-c_main} |   2 +-
>  ...{diff.show_-m_master => diff.show_-m_main} |   2 +-
>  t/t4013/{diff.show_master => diff.show_main}  |   2 +-
>  ..._--patch-with-stat_--summary_main_--_dir_} |   2 +-
>  ...> diff.whatchanged_--patch-with-stat_main} |   2 +-
>  ...hatchanged_--patch-with-stat_main_--_dir_} |   2 +-
>  ...oot_--cc_--patch-with-stat_--summary_main} |   2 +-
>  ...d_--root_--patch-with-stat_--summary_main} |   2 +-
>  ...whatchanged_--root_--patch-with-stat_main} |   2 +-
>  ...-root_-c_--patch-with-stat_--summary_main} |   2 +-
>  ...master => diff.whatchanged_--root_-p_main} |   2 +-
>  ...ot_master => diff.whatchanged_--root_main} |   2 +-
>  ...-p_master => diff.whatchanged_-SF_-p_main} |   2 +-
>  ...d_-SF_master => diff.whatchanged_-SF_main} |   2 +-
>  ...ged_-p_master => diff.whatchanged_-p_main} |   2 +-
>  ...atchanged_master => diff.whatchanged_main} |   2 +-
>  86 files changed, 184 insertions(+), 181 deletions(-)
>  rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_--summary_master => diff.diff-tree_--cc_--patch-with-stat_--summary_main} (86%)
>  rename t/t4013/{diff.diff-tree_--cc_--patch-with-stat_master => diff.diff-tree_--cc_--patch-with-stat_main} (89%)
>  rename t/t4013/{diff.diff-tree_--cc_--shortstat_master => diff.diff-tree_--cc_--shortstat_main} (65%)
>  rename t/t4013/{diff.diff-tree_-c_--stat_--summary_master => diff.diff-tree_--cc_--stat_--summary_main} (71%)
>  rename t/t4013/{diff.diff-tree_-c_--stat_master => diff.diff-tree_--cc_--stat_main} (76%)
>  rename t/t4013/{diff.diff-tree_--cc_master => diff.diff-tree_--cc_main} (91%)
>  rename t/t4013/{diff.diff-tree_-c_--abbrev_master => diff.diff-tree_-c_--abbrev_main} (83%)
>  rename t/t4013/{diff.diff-tree_--cc_--stat_--summary_master => diff.diff-tree_-c_--stat_--summary_main} (70%)
>  rename t/t4013/{diff.diff-tree_--cc_--stat_master => diff.diff-tree_-c_--stat_main} (75%)
>  rename t/t4013/{diff.diff-tree_-c_master => diff.diff-tree_-c_main} (93%)
>  rename t/t4013/{diff.diff-tree_-p_-m_master => diff.diff-tree_-p_-m_main} (97%)
>  create mode 100644 t/t4013/diff.diff-tree_-p_main
>  delete mode 100644 t/t4013/diff.diff-tree_-p_master
>  create mode 100644 t/t4013/diff.diff-tree_main
>  delete mode 100644 t/t4013/diff.diff-tree_master
>  create mode 100644 t/t4013/diff.diff_--dirstat_--cc_main~1_main
>  delete mode 100644 t/t4013/diff.diff_--dirstat_--cc_master~1_master
>  create mode 100644 t/t4013/diff.diff_--dirstat_main~1_main~2
>  delete mode 100644 t/t4013/diff.diff_--dirstat_master~1_master~2
>  rename t/t4013/{diff.diff_--line-prefix=abc_master_master^_side => diff.diff_--line-prefix=abc_main_main^_side} (87%)
>  rename t/t4013/{diff.diff_master_master^_side => diff.diff_main_main^_side} (89%)
>  rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master => diff.format-patch_--attach_--stdout_initial..main} (98%)
>  rename t/t4013/{diff.format-patch_--attach_--stdout_initial..master^ => diff.format-patch_--attach_--stdout_initial..main^} (97%)
>  rename t/t4013/{diff.format-patch_--inline_--stdout_--numbered-files_initial..master => diff.format-patch_--inline_--stdout_--numbered-files_initial..main} (99%)
>  rename t/t4013/{diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master => diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main} (99%)
>  rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master => diff.format-patch_--inline_--stdout_initial..main} (98%)
>  rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^ => diff.format-patch_--inline_--stdout_initial..main^} (97%)
>  rename t/t4013/{diff.format-patch_--inline_--stdout_initial..master^^ => diff.format-patch_--inline_--stdout_initial..main^^} (95%)
>  rename t/t4013/{diff.format-patch_--stdout_--cover-letter_-n_initial..master^ => diff.format-patch_--stdout_--cover-letter_-n_initial..main^} (96%)
>  rename t/t4013/{diff.format-patch_--stdout_--no-numbered_initial..master => diff.format-patch_--stdout_--no-numbered_initial..main} (97%)
>  rename t/t4013/{diff.format-patch_--stdout_--numbered_initial..master => diff.format-patch_--stdout_--numbered_initial..main} (97%)
>  rename t/t4013/{diff.format-patch_--stdout_initial..master => diff.format-patch_--stdout_initial..main} (97%)
>  rename t/t4013/{diff.format-patch_--stdout_initial..master^ => diff.format-patch_--stdout_initial..main^} (96%)
>  rename t/t4013/{diff.log_--no-diff-merges_-p_--first-parent_master => diff.log_--diff-merges=off_-p_--first-parent_main} (95%)
>  rename t/t4013/{diff.log_--first-parent_--diff-merges=off_-p_master => diff.log_--first-parent_--diff-merges=off_-p_main} (95%)
>  rename t/t4013/{diff.log_--diff-merges=off_-p_--first-parent_master => diff.log_--no-diff-merges_-p_--first-parent_main} (95%)
>  rename t/t4013/{diff.log_--patch-with-stat_--summary_master_--_dir_ => diff.log_--patch-with-stat_--summary_main_--_dir_} (96%)
>  rename t/t4013/{diff.log_--patch-with-stat_master => diff.log_--patch-with-stat_main} (98%)
>  rename t/t4013/{diff.log_--patch-with-stat_master_--_dir_ => diff.log_--patch-with-stat_main_--_dir_} (96%)
>  rename t/t4013/{diff.log_--root_--cc_--patch-with-stat_--summary_master => diff.log_--root_--cc_--patch-with-stat_--summary_main} (98%)
>  rename t/t4013/{diff.log_--root_--patch-with-stat_--summary_master => diff.log_--root_--patch-with-stat_--summary_main} (98%)
>  rename t/t4013/{diff.log_--root_--patch-with-stat_master => diff.log_--root_--patch-with-stat_main} (98%)
>  rename t/t4013/{diff.log_--root_-c_--patch-with-stat_--summary_master => diff.log_--root_-c_--patch-with-stat_--summary_main} (98%)
>  rename t/t4013/{diff.log_--root_-p_master => diff.log_--root_-p_main} (98%)
>  rename t/t4013/{diff.log_--root_master => diff.log_--root_main} (96%)
>  rename t/t4013/{diff.log_-GF_-p_--pickaxe-all_master => diff.log_-GF_-p_--pickaxe-all_main} (90%)
>  rename t/t4013/{diff.log_-GF_-p_master => diff.log_-GF_-p_main} (91%)
>  rename t/t4013/{diff.log_-SF_master => diff.log_-GF_main} (86%)
>  rename t/t4013/{diff.log_-IA_-IB_-I1_-I2_-p_master => diff.log_-IA_-IB_-I1_-I2_-p_main} (97%)
>  rename t/t4013/{diff.log_-SF_-p_master => diff.log_-SF_-p_main} (91%)
>  rename t/t4013/{diff.log_-GF_master => diff.log_-SF_main} (86%)
>  create mode 100644 t/t4013/diff.log_-SF_main_--max-count=0
>  rename t/t4013/{diff.log_-SF_master_--max-count=2 => diff.log_-SF_main_--max-count=1} (79%)
>  create mode 100644 t/t4013/diff.log_-SF_main_--max-count=2
>  delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=0
>  delete mode 100644 t/t4013/diff.log_-SF_master_--max-count=1
>  rename t/t4013/{diff.log_-S_F_master => diff.log_-S_F_main} (86%)
>  rename t/t4013/{diff.log_-m_-p_--first-parent_master => diff.log_-m_-p_--first-parent_main} (97%)
>  rename t/t4013/{diff.log_-m_-p_master => diff.log_-m_-p_main} (99%)
>  rename t/t4013/{diff.log_-p_--first-parent_master => diff.log_-p_--first-parent_main} (97%)
>  rename t/t4013/{diff.log_-p_master => diff.log_-p_main} (98%)
>  rename t/t4013/{diff.log_master => diff.log_main} (97%)
>  rename t/t4013/{diff.noellipses-diff-tree_-c_--abbrev_master => diff.noellipses-diff-tree_-c_--abbrev_main} (81%)
>  rename t/t4013/{diff.noellipses-whatchanged_--root_master => diff.noellipses-whatchanged_--root_main} (96%)
>  rename t/t4013/{diff.noellipses-whatchanged_-SF_master => diff.noellipses-whatchanged_-SF_main} (86%)
>  rename t/t4013/{diff.noellipses-whatchanged_master => diff.noellipses-whatchanged_main} (96%)
>  rename t/t4013/{diff.show_--first-parent_master => diff.show_--first-parent_main} (92%)
>  rename t/t4013/{diff.show_-c_master => diff.show_-c_main} (95%)
>  rename t/t4013/{diff.show_-m_master => diff.show_-m_main} (98%)
>  rename t/t4013/{diff.show_master => diff.show_main} (96%)
>  rename t/t4013/{diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ => diff.whatchanged_--patch-with-stat_--summary_main_--_dir_} (94%)
>  rename t/t4013/{diff.whatchanged_--patch-with-stat_master => diff.whatchanged_--patch-with-stat_main} (97%)
>  rename t/t4013/{diff.whatchanged_--patch-with-stat_master_--_dir_ => diff.whatchanged_--patch-with-stat_main_--_dir_} (94%)
>  rename t/t4013/{diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master => diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main} (97%)
>  rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_--summary_master => diff.whatchanged_--root_--patch-with-stat_--summary_main} (97%)
>  rename t/t4013/{diff.whatchanged_--root_--patch-with-stat_master => diff.whatchanged_--root_--patch-with-stat_main} (97%)
>  rename t/t4013/{diff.whatchanged_--root_-c_--patch-with-stat_--summary_master => diff.whatchanged_--root_-c_--patch-with-stat_--summary_main} (97%)
>  rename t/t4013/{diff.whatchanged_--root_-p_master => diff.whatchanged_--root_-p_main} (98%)
>  rename t/t4013/{diff.whatchanged_--root_master => diff.whatchanged_--root_main} (97%)
>  rename t/t4013/{diff.whatchanged_-SF_-p_master => diff.whatchanged_-SF_-p_main} (89%)
>  rename t/t4013/{diff.whatchanged_-SF_master => diff.whatchanged_-SF_main} (86%)
>  rename t/t4013/{diff.whatchanged_-p_master => diff.whatchanged_-p_main} (98%)
>  rename t/t4013/{diff.whatchanged_master => diff.whatchanged_main} (97%)
>
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index f72d456d3b..25c2952c40 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -5,6 +5,9 @@
>
>  test_description='Various diff formatting options'
>
> +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
> +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
> +
>  . ./test-lib.sh
>  . "$TEST_DIRECTORY"/diff-lib.sh
>
> @@ -61,7 +64,7 @@ test_expect_success setup '
>  	GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
>  	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
>
> -	git checkout master &&
> +	git checkout main &&
>  	git pull -s ours . side &&
>
>  	GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
> @@ -86,7 +89,7 @@ test_expect_success setup '
>  	for i in B A; do echo $i; done >dir/sub &&
>  	git add dir/sub &&
>  	git commit -m "Rearranged lines in dir/sub" &&
> -	git checkout master &&
> +	git checkout main &&
>
>  	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
>  	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
> @@ -94,7 +97,7 @@ test_expect_success setup '
>  	git checkout -b mode initial &&
>  	git update-index --chmod=+x file0 &&
>  	git commit -m "update mode" &&
> -	git checkout -f master &&
> +	git checkout -f main &&
>
>  	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
>  	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
> @@ -103,12 +106,12 @@ test_expect_success setup '
>  	git update-index --chmod=+x file2 &&
>  	git commit -m "update mode (file2)" &&
>  	git notes add -m "note" &&
> -	git checkout -f master &&
> +	git checkout -f main &&
>
> -	# Same merge as master, but with parents reversed. Hide it in a
> +	# Same merge as main, but with parents reversed. Hide it in a
>  	# pseudo-ref to avoid impacting tests with --all.
>  	commit=$(echo reverse |
> -		 git commit-tree -p master^2 -p master^1 master^{tree}) &&
> +		 git commit-tree -p main^2 -p main^1 main^{tree}) &&
>  	git update-ref REVERSE $commit &&
>
>  	git config diff.renames false &&
> @@ -118,15 +121,15 @@ test_expect_success setup '
>
>  : <<\EOF
>  ! [initial] Initial
> - * [master] Merge branch 'side'
> + * [main] Merge branch 'side'
>    ! [rearrange] Rearranged lines in dir/sub
>     ! [side] Side
>  ----
>    +  [rearrange] Rearranged lines in dir/sub
> - -   [master] Merge branch 'side'
> + -   [main] Merge branch 'side'
>   * + [side] Side
> - *   [master^] Third
> - *   [master~2] Second
> + *   [main^] Third
> + *   [main~2] Second
>  +*++ [initial] Initial
>  EOF
>
> @@ -284,92 +287,92 @@ diff-tree initial mode
>  diff-tree --stat initial mode
>  diff-tree --summary initial mode
>
> -diff-tree master
> -diff-tree -p master
> -diff-tree -p -m master
> -diff-tree -c master
> -diff-tree -c --abbrev master
> -:noellipses diff-tree -c --abbrev master
> -diff-tree --cc master
> +diff-tree main
> +diff-tree -p main
> +diff-tree -p -m main
> +diff-tree -c main
> +diff-tree -c --abbrev main
> +:noellipses diff-tree -c --abbrev main
> +diff-tree --cc main
>  # stat only should show the diffstat with the first parent
> -diff-tree -c --stat master
> -diff-tree --cc --stat master
> -diff-tree -c --stat --summary master
> -diff-tree --cc --stat --summary master
> +diff-tree -c --stat main
> +diff-tree --cc --stat main
> +diff-tree -c --stat --summary main
> +diff-tree --cc --stat --summary main
>  # stat summary should show the diffstat and summary with the first parent
>  diff-tree -c --stat --summary side
>  diff-tree --cc --stat --summary side
> -diff-tree --cc --shortstat master
> +diff-tree --cc --shortstat main
>  diff-tree --cc --summary REVERSE
>  # improved by Timo's patch
> -diff-tree --cc --patch-with-stat master
> +diff-tree --cc --patch-with-stat main
>  # improved by Timo's patch
> -diff-tree --cc --patch-with-stat --summary master
> +diff-tree --cc --patch-with-stat --summary main
>  # this is correct
>  diff-tree --cc --patch-with-stat --summary side
>
> -log master
> -log -p master
> -log --root master
> -log --root -p master
> -log --patch-with-stat master
> -log --root --patch-with-stat master
> -log --root --patch-with-stat --summary master
> +log main
> +log -p main
> +log --root main
> +log --root -p main
> +log --patch-with-stat main
> +log --root --patch-with-stat main
> +log --root --patch-with-stat --summary main
>  # improved by Timo's patch
> -log --root -c --patch-with-stat --summary master
> +log --root -c --patch-with-stat --summary main
>  # improved by Timo's patch
> -log --root --cc --patch-with-stat --summary master
> -log --no-diff-merges -p --first-parent master
> -log --diff-merges=off -p --first-parent master
> -log --first-parent --diff-merges=off -p master
> -log -p --first-parent master
> -log -m -p --first-parent master
> -log -m -p master
> -log -SF master
> -log -S F master
> -log -SF -p master
> -log -SF master --max-count=0
> -log -SF master --max-count=1
> -log -SF master --max-count=2
> -log -GF master
> -log -GF -p master
> -log -GF -p --pickaxe-all master
> -log -IA -IB -I1 -I2 -p master
> +log --root --cc --patch-with-stat --summary main
> +log --no-diff-merges -p --first-parent main
> +log --diff-merges=off -p --first-parent main
> +log --first-parent --diff-merges=off -p main
> +log -p --first-parent main
> +log -m -p --first-parent main
> +log -m -p main
> +log -SF main
> +log -S F main
> +log -SF -p main
> +log -SF main --max-count=0
> +log -SF main --max-count=1
> +log -SF main --max-count=2
> +log -GF main
> +log -GF -p main
> +log -GF -p --pickaxe-all main
> +log -IA -IB -I1 -I2 -p main
>  log --decorate --all
>  log --decorate=full --all
>
>  rev-list --parents HEAD
>  rev-list --children HEAD
>
> -whatchanged master
> -:noellipses whatchanged master
> -whatchanged -p master
> -whatchanged --root master
> -:noellipses whatchanged --root master
> -whatchanged --root -p master
> -whatchanged --patch-with-stat master
> -whatchanged --root --patch-with-stat master
> -whatchanged --root --patch-with-stat --summary master
> +whatchanged main
> +:noellipses whatchanged main
> +whatchanged -p main
> +whatchanged --root main
> +:noellipses whatchanged --root main
> +whatchanged --root -p main
> +whatchanged --patch-with-stat main
> +whatchanged --root --patch-with-stat main
> +whatchanged --root --patch-with-stat --summary main
>  # improved by Timo's patch
> -whatchanged --root -c --patch-with-stat --summary master
> +whatchanged --root -c --patch-with-stat --summary main
>  # improved by Timo's patch
> -whatchanged --root --cc --patch-with-stat --summary master
> -whatchanged -SF master
> -:noellipses whatchanged -SF master
> -whatchanged -SF -p master
> +whatchanged --root --cc --patch-with-stat --summary main
> +whatchanged -SF main
> +:noellipses whatchanged -SF main
> +whatchanged -SF -p main
>
> -log --patch-with-stat master -- dir/
> -whatchanged --patch-with-stat master -- dir/
> -log --patch-with-stat --summary master -- dir/
> -whatchanged --patch-with-stat --summary master -- dir/
> +log --patch-with-stat main -- dir/
> +whatchanged --patch-with-stat main -- dir/
> +log --patch-with-stat --summary main -- dir/
> +whatchanged --patch-with-stat --summary main -- dir/
>
>  show initial
>  show --root initial
>  show side
> -show master
> -show -c master
> -show -m master
> -show --first-parent master
> +show main
> +show -c main
> +show -m main
> +show --first-parent main
>  show --stat side
>  show --stat --summary side
>  show --patch-with-stat side
> @@ -378,22 +381,22 @@ show --patch-with-raw side
>  show --patch-with-stat --summary side
>
>  format-patch --stdout initial..side
> -format-patch --stdout initial..master^
> -format-patch --stdout initial..master
> -format-patch --stdout --no-numbered initial..master
> -format-patch --stdout --numbered initial..master
> +format-patch --stdout initial..main^
> +format-patch --stdout initial..main
> +format-patch --stdout --no-numbered initial..main
> +format-patch --stdout --numbered initial..main
>  format-patch --attach --stdout initial..side
>  format-patch --attach --stdout --suffix=.diff initial..side
> -format-patch --attach --stdout initial..master^
> -format-patch --attach --stdout initial..master
> +format-patch --attach --stdout initial..main^
> +format-patch --attach --stdout initial..main
>  format-patch --inline --stdout initial..side
> -format-patch --inline --stdout initial..master^
> -format-patch --inline --stdout --numbered-files initial..master
> -format-patch --inline --stdout initial..master
> -format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
> +format-patch --inline --stdout initial..main^
> +format-patch --inline --stdout --numbered-files initial..main
> +format-patch --inline --stdout initial..main
> +format-patch --inline --stdout --subject-prefix=TESTCASE initial..main
>  config format.subjectprefix DIFFERENT_PREFIX
> -format-patch --inline --stdout initial..master^^
> -format-patch --stdout --cover-letter -n initial..master^
> +format-patch --inline --stdout initial..main^^
> +format-patch --stdout --cover-letter -n initial..main^
>
>  diff --abbrev initial..side
>  diff -U initial..side
> @@ -412,13 +415,13 @@ diff --name-status dir2 dir
>  diff --no-index --name-status dir2 dir
>  diff --no-index --name-status -- dir2 dir
>  diff --no-index dir dir3
> -diff master master^ side
> +diff main main^ side
>  # Can't use spaces...
> -diff --line-prefix=abc master master^ side
> -diff --dirstat master~1 master~2
> +diff --line-prefix=abc main main^ side
> +diff --dirstat main~1 main~2
>  diff --dirstat initial rearrange
>  diff --dirstat-by-file initial rearrange
> -diff --dirstat --cc master~1 master
> +diff --dirstat --cc main~1 main
>  # No-index --abbrev and --no-abbrev
>  diff --raw initial
>  :noellipses diff --raw initial
> @@ -471,12 +474,12 @@ test_expect_success 'diff-tree --stdin with log formatting' '
>  	Third
>  	Second
>  	EOF
> -	git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
> +	git rev-list main | git diff-tree --stdin --format=%s -s >actual &&
>  	test_cmp expect actual
>  '
>
>  test_expect_success 'diff -I<regex>: setup' '
> -	git checkout master &&
> +	git checkout main &&
>  	test_seq 50 >file0 &&
>  	git commit -m "Set up -I<regex> test file" file0 &&
>  	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
> diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
> similarity index 86%
> rename from t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
> rename to t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
> index 9951e3677d..af1cf20f4c 100644
> --- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree --cc --patch-with-stat --summary master
> +$ git diff-tree --cc --patch-with-stat --summary main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
> similarity index 89%
> rename from t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
> rename to t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
> index db3c0a7b2c..0ec6042097 100644
> --- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
> +++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree --cc --patch-with-stat master
> +$ git diff-tree --cc --patch-with-stat main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.diff-tree_--cc_--shortstat_master b/t/t4013/diff.diff-tree_--cc_--shortstat_main
> similarity index 65%
> rename from t/t4013/diff.diff-tree_--cc_--shortstat_master
> rename to t/t4013/diff.diff-tree_--cc_--shortstat_main
> index a4ca42df2a..9a4ef03197 100644
> --- a/t/t4013/diff.diff-tree_--cc_--shortstat_master
> +++ b/t/t4013/diff.diff-tree_--cc_--shortstat_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree --cc --shortstat master
> +$ git diff-tree --cc --shortstat main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>   2 files changed, 5 insertions(+)
>  $
> diff --git a/t/t4013/diff.diff-tree_-c_--stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--stat_--summary_main
> similarity index 71%
> rename from t/t4013/diff.diff-tree_-c_--stat_--summary_master
> rename to t/t4013/diff.diff-tree_--cc_--stat_--summary_main
> index 81c3021541..9db08a4aa9 100644
> --- a/t/t4013/diff.diff-tree_-c_--stat_--summary_master
> +++ b/t/t4013/diff.diff-tree_--cc_--stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree -c --stat --summary master
> +$ git diff-tree --cc --stat --summary main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.diff-tree_-c_--stat_master b/t/t4013/diff.diff-tree_--cc_--stat_main
> similarity index 76%
> rename from t/t4013/diff.diff-tree_-c_--stat_master
> rename to t/t4013/diff.diff-tree_--cc_--stat_main
> index 89d59b1548..7ecc67a524 100644
> --- a/t/t4013/diff.diff-tree_-c_--stat_master
> +++ b/t/t4013/diff.diff-tree_--cc_--stat_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree -c --stat master
> +$ git diff-tree --cc --stat main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.diff-tree_--cc_master b/t/t4013/diff.diff-tree_--cc_main
> similarity index 91%
> rename from t/t4013/diff.diff-tree_--cc_master
> rename to t/t4013/diff.diff-tree_--cc_main
> index 5ecb4e14ae..1a962856ad 100644
> --- a/t/t4013/diff.diff-tree_--cc_master
> +++ b/t/t4013/diff.diff-tree_--cc_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree --cc master
> +$ git diff-tree --cc main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>  diff --cc dir/sub
>  index cead32e,7289e35..992913c
> diff --git a/t/t4013/diff.diff-tree_-c_--abbrev_master b/t/t4013/diff.diff-tree_-c_--abbrev_main
> similarity index 83%
> rename from t/t4013/diff.diff-tree_-c_--abbrev_master
> rename to t/t4013/diff.diff-tree_-c_--abbrev_main
> index b8e4aa2530..039d127cf2 100644
> --- a/t/t4013/diff.diff-tree_-c_--abbrev_master
> +++ b/t/t4013/diff.diff-tree_-c_--abbrev_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree -c --abbrev master
> +$ git diff-tree -c --abbrev main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>  ::100644 100644 100644 cead32e... 7289e35... 992913c... MM	dir/sub
>  ::100644 100644 100644 b414108... f4615da... 10a8a9f... MM	file0
> diff --git a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master b/t/t4013/diff.diff-tree_-c_--stat_--summary_main
> similarity index 70%
> rename from t/t4013/diff.diff-tree_--cc_--stat_--summary_master
> rename to t/t4013/diff.diff-tree_-c_--stat_--summary_main
> index d019867dd9..05a8d16ba7 100644
> --- a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master
> +++ b/t/t4013/diff.diff-tree_-c_--stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree --cc --stat --summary master
> +$ git diff-tree -c --stat --summary main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.diff-tree_--cc_--stat_master b/t/t4013/diff.diff-tree_-c_--stat_main
> similarity index 75%
> rename from t/t4013/diff.diff-tree_--cc_--stat_master
> rename to t/t4013/diff.diff-tree_-c_--stat_main
> index 40b91796b3..61d9f450df 100644
> --- a/t/t4013/diff.diff-tree_--cc_--stat_master
> +++ b/t/t4013/diff.diff-tree_-c_--stat_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree --cc --stat master
> +$ git diff-tree -c --stat main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>   dir/sub | 2 ++
>   file0   | 3 +++
> diff --git a/t/t4013/diff.diff-tree_-c_master b/t/t4013/diff.diff-tree_-c_main
> similarity index 93%
> rename from t/t4013/diff.diff-tree_-c_master
> rename to t/t4013/diff.diff-tree_-c_main
> index e2d2bb2611..a84e1185cf 100644
> --- a/t/t4013/diff.diff-tree_-c_master
> +++ b/t/t4013/diff.diff-tree_-c_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree -c master
> +$ git diff-tree -c main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>  ::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM	dir/sub
>  ::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM	file0
> diff --git a/t/t4013/diff.diff-tree_-p_-m_master b/t/t4013/diff.diff-tree_-p_-m_main
> similarity index 97%
> rename from t/t4013/diff.diff-tree_-p_-m_master
> rename to t/t4013/diff.diff-tree_-p_-m_main
> index b60bea039d..29c9fc20b8 100644
> --- a/t/t4013/diff.diff-tree_-p_-m_master
> +++ b/t/t4013/diff.diff-tree_-p_-m_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree -p -m master
> +$ git diff-tree -p -m main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>  diff --git a/dir/sub b/dir/sub
>  index cead32e..992913c 100644
> diff --git a/t/t4013/diff.diff-tree_-p_main b/t/t4013/diff.diff-tree_-p_main
> new file mode 100644
> index 0000000000..c658062422
> --- /dev/null
> +++ b/t/t4013/diff.diff-tree_-p_main
> @@ -0,0 +1,2 @@
> +$ git diff-tree -p main
> +$
> diff --git a/t/t4013/diff.diff-tree_-p_master b/t/t4013/diff.diff-tree_-p_master
> deleted file mode 100644
> index b182875fb2..0000000000
> --- a/t/t4013/diff.diff-tree_-p_master
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -$ git diff-tree -p master
> -$
> diff --git a/t/t4013/diff.diff-tree_main b/t/t4013/diff.diff-tree_main
> new file mode 100644
> index 0000000000..dc5b9fdeb6
> --- /dev/null
> +++ b/t/t4013/diff.diff-tree_main
> @@ -0,0 +1,2 @@
> +$ git diff-tree main
> +$
> diff --git a/t/t4013/diff.diff-tree_master b/t/t4013/diff.diff-tree_master
> deleted file mode 100644
> index fe9226f8a1..0000000000
> --- a/t/t4013/diff.diff-tree_master
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -$ git diff-tree master
> -$
> diff --git a/t/t4013/diff.diff_--dirstat_--cc_main~1_main b/t/t4013/diff.diff_--dirstat_--cc_main~1_main
> new file mode 100644
> index 0000000000..168a357a02
> --- /dev/null
> +++ b/t/t4013/diff.diff_--dirstat_--cc_main~1_main
> @@ -0,0 +1,3 @@
> +$ git diff --dirstat --cc main~1 main
> +  40.0% dir/
> +$
> diff --git a/t/t4013/diff.diff_--dirstat_--cc_master~1_master b/t/t4013/diff.diff_--dirstat_--cc_master~1_master
> deleted file mode 100644
> index fba4e34175..0000000000
> --- a/t/t4013/diff.diff_--dirstat_--cc_master~1_master
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -$ git diff --dirstat --cc master~1 master
> -  40.0% dir/
> -$
> diff --git a/t/t4013/diff.diff_--dirstat_main~1_main~2 b/t/t4013/diff.diff_--dirstat_main~1_main~2
> new file mode 100644
> index 0000000000..6809733708
> --- /dev/null
> +++ b/t/t4013/diff.diff_--dirstat_main~1_main~2
> @@ -0,0 +1,3 @@
> +$ git diff --dirstat main~1 main~2
> +  40.0% dir/
> +$
> diff --git a/t/t4013/diff.diff_--dirstat_master~1_master~2 b/t/t4013/diff.diff_--dirstat_master~1_master~2
> deleted file mode 100644
> index b672e1ca63..0000000000
> --- a/t/t4013/diff.diff_--dirstat_master~1_master~2
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -$ git diff --dirstat master~1 master~2
> -  40.0% dir/
> -$
> diff --git a/t/t4013/diff.diff_--line-prefix=abc_master_master^_side b/t/t4013/diff.diff_--line-prefix=abc_main_main^_side
> similarity index 87%
> rename from t/t4013/diff.diff_--line-prefix=abc_master_master^_side
> rename to t/t4013/diff.diff_--line-prefix=abc_main_main^_side
> index 99f91e7f0e..67a2145a36 100644
> --- a/t/t4013/diff.diff_--line-prefix=abc_master_master^_side
> +++ b/t/t4013/diff.diff_--line-prefix=abc_main_main^_side
> @@ -1,4 +1,4 @@
> -$ git diff --line-prefix=abc master master^ side
> +$ git diff --line-prefix=abc main main^ side
>  abcdiff --cc dir/sub
>  abcindex cead32e,7289e35..992913c
>  abc--- a/dir/sub
> diff --git a/t/t4013/diff.diff_master_master^_side b/t/t4013/diff.diff_main_main^_side
> similarity index 89%
> rename from t/t4013/diff.diff_master_master^_side
> rename to t/t4013/diff.diff_main_main^_side
> index 50ec9cadd6..ab81ec9e47 100644
> --- a/t/t4013/diff.diff_master_master^_side
> +++ b/t/t4013/diff.diff_main_main^_side
> @@ -1,4 +1,4 @@
> -$ git diff master master^ side
> +$ git diff main main^ side
>  diff --cc dir/sub
>  index cead32e,7289e35..992913c
>  --- a/dir/sub
> diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/t/t4013/diff.format-patch_--attach_--stdout_initial..main
> similarity index 98%
> rename from t/t4013/diff.format-patch_--attach_--stdout_initial..master
> rename to t/t4013/diff.format-patch_--attach_--stdout_initial..main
> index 52fedc179e..9f56380350 100644
> --- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master
> +++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main
> @@ -1,4 +1,4 @@
> -$ git format-patch --attach --stdout initial..master
> +$ git format-patch --attach --stdout initial..main
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main^
> similarity index 97%
> rename from t/t4013/diff.format-patch_--attach_--stdout_initial..master^
> rename to t/t4013/diff.format-patch_--attach_--stdout_initial..main^
> index 1c3cde251b..80132ea99e 100644
> --- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
> +++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..main^
> @@ -1,4 +1,4 @@
> -$ git format-patch --attach --stdout initial..master^
> +$ git format-patch --attach --stdout initial..main^
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
> similarity index 99%
> rename from t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
> rename to t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
> index 02c4db7ec5..8e889090fb 100644
> --- a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
> +++ b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
> @@ -1,4 +1,4 @@
> -$ git format-patch --inline --stdout --numbered-files initial..master
> +$ git format-patch --inline --stdout --numbered-files initial..main
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
> similarity index 99%
> rename from t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
> rename to t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
> index c7677c5951..d7d2b12d15 100644
> --- a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
> +++ b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
> @@ -1,4 +1,4 @@
> -$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
> +$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..main
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_initial..main
> similarity index 98%
> rename from t/t4013/diff.format-patch_--inline_--stdout_initial..master
> rename to t/t4013/diff.format-patch_--inline_--stdout_initial..main
> index 5b3e34e2c0..c49c423f82 100644
> --- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master
> +++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main
> @@ -1,4 +1,4 @@
> -$ git format-patch --inline --stdout initial..master
> +$ git format-patch --inline --stdout initial..main
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^
> similarity index 97%
> rename from t/t4013/diff.format-patch_--inline_--stdout_initial..master^
> rename to t/t4013/diff.format-patch_--inline_--stdout_initial..main^
> index d13f8a8128..8669dbfe6c 100644
> --- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
> +++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^
> @@ -1,4 +1,4 @@
> -$ git format-patch --inline --stdout initial..master^
> +$ git format-patch --inline --stdout initial..main^
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
> similarity index 95%
> rename from t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
> rename to t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
> index caec5537de..b749be58b0 100644
> --- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
> +++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
> @@ -1,4 +1,4 @@
> -$ git format-patch --inline --stdout initial..master^^
> +$ git format-patch --inline --stdout initial..main^^
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
> similarity index 96%
> rename from t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
> rename to t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
> index 244d964fc6..567f222198 100644
> --- a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
> +++ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
> @@ -1,4 +1,4 @@
> -$ git format-patch --stdout --cover-letter -n initial..master^
> +$ git format-patch --stdout --cover-letter -n initial..main^
>  From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
>  From: C O Mitter <committer@example.com>
>  Date: Mon, 26 Jun 2006 00:06:00 +0000
> diff --git a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
> similarity index 97%
> rename from t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
> rename to t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
> index bfc287a147..195b62ea4f 100644
> --- a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
> +++ b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
> @@ -1,4 +1,4 @@
> -$ git format-patch --stdout --no-numbered initial..master
> +$ git format-patch --stdout --no-numbered initial..main
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--numbered_initial..main
> similarity index 97%
> rename from t/t4013/diff.format-patch_--stdout_--numbered_initial..master
> rename to t/t4013/diff.format-patch_--stdout_--numbered_initial..main
> index 568f6f584e..0678a38515 100644
> --- a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master
> +++ b/t/t4013/diff.format-patch_--stdout_--numbered_initial..main
> @@ -1,4 +1,4 @@
> -$ git format-patch --stdout --numbered initial..master
> +$ git format-patch --stdout --numbered initial..main
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..main
> similarity index 97%
> rename from t/t4013/diff.format-patch_--stdout_initial..master
> rename to t/t4013/diff.format-patch_--stdout_initial..main
> index 5f0352f9f7..b4a6302e7c 100644
> --- a/t/t4013/diff.format-patch_--stdout_initial..master
> +++ b/t/t4013/diff.format-patch_--stdout_initial..main
> @@ -1,4 +1,4 @@
> -$ git format-patch --stdout initial..master
> +$ git format-patch --stdout initial..main
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..main^
> similarity index 96%
> rename from t/t4013/diff.format-patch_--stdout_initial..master^
> rename to t/t4013/diff.format-patch_--stdout_initial..main^
> index 2ae454d807..36b3221582 100644
> --- a/t/t4013/diff.format-patch_--stdout_initial..master^
> +++ b/t/t4013/diff.format-patch_--stdout_initial..main^
> @@ -1,4 +1,4 @@
> -$ git format-patch --stdout initial..master^
> +$ git format-patch --stdout initial..main^
>  From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
>  From: A U Thor <author@example.com>
>  Date: Mon, 26 Jun 2006 00:01:00 +0000
> diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
> index 3f9b872ece..7cfd2ea22d 100644
> --- a/t/t4013/diff.log_--decorate=full_--all
> +++ b/t/t4013/diff.log_--decorate=full_--all
> @@ -26,7 +26,7 @@ Date:   Mon Jun 26 00:06:00 2006 +0000
>
>      Notes added by 'git notes add'
>
> -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master)
> +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/main)
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
> diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
> index f5e20e1e14..735f1aa83c 100644
> --- a/t/t4013/diff.log_--decorate_--all
> +++ b/t/t4013/diff.log_--decorate_--all
> @@ -26,7 +26,7 @@ Date:   Mon Jun 26 00:06:00 2006 +0000
>
>      Notes added by 'git notes add'
>
> -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master)
> +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> main)
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:04:00 2006 +0000
> diff --git a/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
> similarity index 95%
> rename from t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
> rename to t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
> index 597002232e..fe180fda3b 100644
> --- a/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
> +++ b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
> @@ -1,4 +1,4 @@
> -$ git log --no-diff-merges -p --first-parent master
> +$ git log --diff-merges=off -p --first-parent main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
> similarity index 95%
> rename from t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
> rename to t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
> index 5d7461a167..dca62d4e60 100644
> --- a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
> +++ b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
> @@ -1,4 +1,4 @@
> -$ git log --first-parent --diff-merges=off -p master
> +$ git log --first-parent --diff-merges=off -p main
>  commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
> similarity index 95%
> rename from t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
> rename to t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
> index 194e893c94..0b54118088 100644
> --- a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
> +++ b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
> @@ -1,4 +1,4 @@
> -$ git log --diff-merges=off -p --first-parent master
> +$ git log --no-diff-merges -p --first-parent main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
> similarity index 96%
> rename from t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
> rename to t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
> index a18f1472a9..3ed46cc867 100644
> --- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
> +++ b/t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
> @@ -1,4 +1,4 @@
> -$ git log --patch-with-stat --summary master -- dir/
> +$ git log --patch-with-stat --summary main -- dir/
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_main
> similarity index 98%
> rename from t/t4013/diff.log_--patch-with-stat_master
> rename to t/t4013/diff.log_--patch-with-stat_main
> index ae425c4672..2e12b557cb 100644
> --- a/t/t4013/diff.log_--patch-with-stat_master
> +++ b/t/t4013/diff.log_--patch-with-stat_main
> @@ -1,4 +1,4 @@
> -$ git log --patch-with-stat master
> +$ git log --patch-with-stat main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_main_--_dir_
> similarity index 96%
> rename from t/t4013/diff.log_--patch-with-stat_master_--_dir_
> rename to t/t4013/diff.log_--patch-with-stat_main_--_dir_
> index d5207cadf4..d511ea7f6b 100644
> --- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_
> +++ b/t/t4013/diff.log_--patch-with-stat_main_--_dir_
> @@ -1,4 +1,4 @@
> -$ git log --patch-with-stat master -- dir/
> +$ git log --patch-with-stat main -- dir/
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
> similarity index 98%
> rename from t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
> rename to t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
> index 0fc1e8cd71..3cfd0e6422 100644
> --- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git log --root --cc --patch-with-stat --summary master
> +$ git log --root --cc --patch-with-stat --summary main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_main
> similarity index 98%
> rename from t/t4013/diff.log_--root_--patch-with-stat_--summary_master
> rename to t/t4013/diff.log_--root_--patch-with-stat_--summary_main
> index dffc09dde9..9f4d6dfa44 100644
> --- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git log --root --patch-with-stat --summary master
> +$ git log --root --patch-with-stat --summary main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_main
> similarity index 98%
> rename from t/t4013/diff.log_--root_--patch-with-stat_master
> rename to t/t4013/diff.log_--root_--patch-with-stat_main
> index 55aa98012d..0d69ae2e11 100644
> --- a/t/t4013/diff.log_--root_--patch-with-stat_master
> +++ b/t/t4013/diff.log_--root_--patch-with-stat_main
> @@ -1,4 +1,4 @@
> -$ git log --root --patch-with-stat master
> +$ git log --root --patch-with-stat main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
> similarity index 98%
> rename from t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
> rename to t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
> index 019d85f7de..1b71add9de 100644
> --- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git log --root -c --patch-with-stat --summary master
> +$ git log --root -c --patch-with-stat --summary main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_main
> similarity index 98%
> rename from t/t4013/diff.log_--root_-p_master
> rename to t/t4013/diff.log_--root_-p_main
> index b42c334439..04581296ed 100644
> --- a/t/t4013/diff.log_--root_-p_master
> +++ b/t/t4013/diff.log_--root_-p_main
> @@ -1,4 +1,4 @@
> -$ git log --root -p master
> +$ git log --root -p main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_main
> similarity index 96%
> rename from t/t4013/diff.log_--root_master
> rename to t/t4013/diff.log_--root_main
> index e8f46159da..d5e90fd6b4 100644
> --- a/t/t4013/diff.log_--root_master
> +++ b/t/t4013/diff.log_--root_main
> @@ -1,4 +1,4 @@
> -$ git log --root master
> +$ git log --root main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_-GF_-p_--pickaxe-all_master b/t/t4013/diff.log_-GF_-p_--pickaxe-all_main
> similarity index 90%
> rename from t/t4013/diff.log_-GF_-p_--pickaxe-all_master
> rename to t/t4013/diff.log_-GF_-p_--pickaxe-all_main
> index d36f88098b..1f7a497c2d 100644
> --- a/t/t4013/diff.log_-GF_-p_--pickaxe-all_master
> +++ b/t/t4013/diff.log_-GF_-p_--pickaxe-all_main
> @@ -1,4 +1,4 @@
> -$ git log -GF -p --pickaxe-all master
> +$ git log -GF -p --pickaxe-all main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.log_-GF_-p_master b/t/t4013/diff.log_-GF_-p_main
> similarity index 91%
> rename from t/t4013/diff.log_-GF_-p_master
> rename to t/t4013/diff.log_-GF_-p_main
> index 9d93f2c23a..c80dda41e9 100644
> --- a/t/t4013/diff.log_-GF_-p_master
> +++ b/t/t4013/diff.log_-GF_-p_main
> @@ -1,4 +1,4 @@
> -$ git log -GF -p master
> +$ git log -GF -p main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.log_-SF_master b/t/t4013/diff.log_-GF_main
> similarity index 86%
> rename from t/t4013/diff.log_-SF_master
> rename to t/t4013/diff.log_-GF_main
> index c1599f2f52..b94a7f7839 100644
> --- a/t/t4013/diff.log_-SF_master
> +++ b/t/t4013/diff.log_-GF_main
> @@ -1,4 +1,4 @@
> -$ git log -SF master
> +$ git log -GF main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
> similarity index 97%
> rename from t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
> rename to t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
> index 929f35a05b..67e26b4e54 100644
> --- a/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
> +++ b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
> @@ -1,4 +1,4 @@
> -$ git log -IA -IB -I1 -I2 -p master
> +$ git log -IA -IB -I1 -I2 -p main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_-SF_-p_master b/t/t4013/diff.log_-SF_-p_main
> similarity index 91%
> rename from t/t4013/diff.log_-SF_-p_master
> rename to t/t4013/diff.log_-SF_-p_main
> index 5e32438972..fa82ac1490 100644
> --- a/t/t4013/diff.log_-SF_-p_master
> +++ b/t/t4013/diff.log_-SF_-p_main
> @@ -1,4 +1,4 @@
> -$ git log -SF -p master
> +$ git log -SF -p main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.log_-GF_master b/t/t4013/diff.log_-SF_main
> similarity index 86%
> rename from t/t4013/diff.log_-GF_master
> rename to t/t4013/diff.log_-SF_main
> index 4c6708d2d0..dbf770db49 100644
> --- a/t/t4013/diff.log_-GF_master
> +++ b/t/t4013/diff.log_-SF_main
> @@ -1,4 +1,4 @@
> -$ git log -GF master
> +$ git log -SF main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.log_-SF_main_--max-count=0 b/t/t4013/diff.log_-SF_main_--max-count=0
> new file mode 100644
> index 0000000000..683b17eb99
> --- /dev/null
> +++ b/t/t4013/diff.log_-SF_main_--max-count=0
> @@ -0,0 +1,2 @@
> +$ git log -SF main --max-count=0
> +$
> diff --git a/t/t4013/diff.log_-SF_master_--max-count=2 b/t/t4013/diff.log_-SF_main_--max-count=1
> similarity index 79%
> rename from t/t4013/diff.log_-SF_master_--max-count=2
> rename to t/t4013/diff.log_-SF_main_--max-count=1
> index a6c55fd482..2102426f8c 100644
> --- a/t/t4013/diff.log_-SF_master_--max-count=2
> +++ b/t/t4013/diff.log_-SF_main_--max-count=1
> @@ -1,4 +1,4 @@
> -$ git log -SF master --max-count=2
> +$ git log -SF main --max-count=1
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.log_-SF_main_--max-count=2 b/t/t4013/diff.log_-SF_main_--max-count=2
> new file mode 100644
> index 0000000000..23e12a4cbb
> --- /dev/null
> +++ b/t/t4013/diff.log_-SF_main_--max-count=2
> @@ -0,0 +1,7 @@
> +$ git log -SF main --max-count=2
> +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
> +Author: A U Thor <author@example.com>
> +Date:   Mon Jun 26 00:02:00 2006 +0000
> +
> +    Third
> +$
> diff --git a/t/t4013/diff.log_-SF_master_--max-count=0 b/t/t4013/diff.log_-SF_master_--max-count=0
> deleted file mode 100644
> index c1fc6c8731..0000000000
> --- a/t/t4013/diff.log_-SF_master_--max-count=0
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -$ git log -SF master --max-count=0
> -$
> diff --git a/t/t4013/diff.log_-SF_master_--max-count=1 b/t/t4013/diff.log_-SF_master_--max-count=1
> deleted file mode 100644
> index c981a03814..0000000000
> --- a/t/t4013/diff.log_-SF_master_--max-count=1
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -$ git log -SF master --max-count=1
> -commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
> -Author: A U Thor <author@example.com>
> -Date:   Mon Jun 26 00:02:00 2006 +0000
> -
> -    Third
> -$
> diff --git a/t/t4013/diff.log_-S_F_master b/t/t4013/diff.log_-S_F_main
> similarity index 86%
> rename from t/t4013/diff.log_-S_F_master
> rename to t/t4013/diff.log_-S_F_main
> index 978d2b4118..a75a42e143 100644
> --- a/t/t4013/diff.log_-S_F_master
> +++ b/t/t4013/diff.log_-S_F_main
> @@ -1,4 +1,4 @@
> -$ git log -S F master
> +$ git log -S F main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_main
> similarity index 97%
> rename from t/t4013/diff.log_-m_-p_--first-parent_master
> rename to t/t4013/diff.log_-m_-p_--first-parent_main
> index 7a0073f529..459e10786b 100644
> --- a/t/t4013/diff.log_-m_-p_--first-parent_master
> +++ b/t/t4013/diff.log_-m_-p_--first-parent_main
> @@ -1,4 +1,4 @@
> -$ git log -m -p --first-parent master
> +$ git log -m -p --first-parent main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_main
> similarity index 99%
> rename from t/t4013/diff.log_-m_-p_master
> rename to t/t4013/diff.log_-m_-p_main
> index 9ca62a01ed..07453c5698 100644
> --- a/t/t4013/diff.log_-m_-p_master
> +++ b/t/t4013/diff.log_-m_-p_main
> @@ -1,4 +1,4 @@
> -$ git log -m -p master
> +$ git log -m -p main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_main
> similarity index 97%
> rename from t/t4013/diff.log_-p_--first-parent_master
> rename to t/t4013/diff.log_-p_--first-parent_main
> index 28840ebea1..247980817b 100644
> --- a/t/t4013/diff.log_-p_--first-parent_master
> +++ b/t/t4013/diff.log_-p_--first-parent_main
> @@ -1,4 +1,4 @@
> -$ git log -p --first-parent master
> +$ git log -p --first-parent main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_main
> similarity index 98%
> rename from t/t4013/diff.log_-p_master
> rename to t/t4013/diff.log_-p_main
> index bf1326dc36..c82b4dbf16 100644
> --- a/t/t4013/diff.log_-p_master
> +++ b/t/t4013/diff.log_-p_main
> @@ -1,4 +1,4 @@
> -$ git log -p master
> +$ git log -p main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_main
> similarity index 97%
> rename from t/t4013/diff.log_master
> rename to t/t4013/diff.log_main
> index a8f6ce5abd..50401f73e6 100644
> --- a/t/t4013/diff.log_master
> +++ b/t/t4013/diff.log_main
> @@ -1,4 +1,4 @@
> -$ git log master
> +$ git log main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
> similarity index 81%
> rename from t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
> rename to t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
> index bb80f013b3..3aa1f80af3 100644
> --- a/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
> +++ b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
> @@ -1,4 +1,4 @@
> -$ git diff-tree -c --abbrev master
> +$ git diff-tree -c --abbrev main
>  59d314ad6f356dd08601a4cd5e530381da3e3c64
>  ::100644 100644 100644 cead32e 7289e35 992913c MM	dir/sub
>  ::100644 100644 100644 b414108 f4615da 10a8a9f MM	file0
> diff --git a/t/t4013/diff.noellipses-whatchanged_--root_master b/t/t4013/diff.noellipses-whatchanged_--root_main
> similarity index 96%
> rename from t/t4013/diff.noellipses-whatchanged_--root_master
> rename to t/t4013/diff.noellipses-whatchanged_--root_main
> index c2cfd4e729..2bec055835 100644
> --- a/t/t4013/diff.noellipses-whatchanged_--root_master
> +++ b/t/t4013/diff.noellipses-whatchanged_--root_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --root master
> +$ git whatchanged --root main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.noellipses-whatchanged_-SF_master b/t/t4013/diff.noellipses-whatchanged_-SF_main
> similarity index 86%
> rename from t/t4013/diff.noellipses-whatchanged_-SF_master
> rename to t/t4013/diff.noellipses-whatchanged_-SF_main
> index b36ce5886e..0c1476d19e 100644
> --- a/t/t4013/diff.noellipses-whatchanged_-SF_master
> +++ b/t/t4013/diff.noellipses-whatchanged_-SF_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged -SF master
> +$ git whatchanged -SF main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.noellipses-whatchanged_master b/t/t4013/diff.noellipses-whatchanged_main
> similarity index 96%
> rename from t/t4013/diff.noellipses-whatchanged_master
> rename to t/t4013/diff.noellipses-whatchanged_main
> index 55e500f2ed..c48d2851aa 100644
> --- a/t/t4013/diff.noellipses-whatchanged_master
> +++ b/t/t4013/diff.noellipses-whatchanged_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged master
> +$ git whatchanged main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.show_--first-parent_master b/t/t4013/diff.show_--first-parent_main
> similarity index 92%
> rename from t/t4013/diff.show_--first-parent_master
> rename to t/t4013/diff.show_--first-parent_main
> index 3dcbe473a0..480502d65c 100644
> --- a/t/t4013/diff.show_--first-parent_master
> +++ b/t/t4013/diff.show_--first-parent_main
> @@ -1,4 +1,4 @@
> -$ git show --first-parent master
> +$ git show --first-parent main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.show_-c_master b/t/t4013/diff.show_-c_main
> similarity index 95%
> rename from t/t4013/diff.show_-c_master
> rename to t/t4013/diff.show_-c_main
> index 81aba8da96..74ef8bc96b 100644
> --- a/t/t4013/diff.show_-c_master
> +++ b/t/t4013/diff.show_-c_main
> @@ -1,4 +1,4 @@
> -$ git show -c master
> +$ git show -c main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.show_-m_master b/t/t4013/diff.show_-m_main
> similarity index 98%
> rename from t/t4013/diff.show_-m_master
> rename to t/t4013/diff.show_-m_main
> index 4ea2ee453d..8fd56736d9 100644
> --- a/t/t4013/diff.show_-m_master
> +++ b/t/t4013/diff.show_-m_main
> @@ -1,4 +1,4 @@
> -$ git show -m master
> +$ git show -m main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_main
> similarity index 96%
> rename from t/t4013/diff.show_master
> rename to t/t4013/diff.show_main
> index fb08ce0e46..630b52a95e 100644
> --- a/t/t4013/diff.show_master
> +++ b/t/t4013/diff.show_main
> @@ -1,4 +1,4 @@
> -$ git show master
> +$ git show main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
> similarity index 94%
> rename from t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
> rename to t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
> index c8b6af2f43..ce0754d556 100644
> --- a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
> +++ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
> @@ -1,4 +1,4 @@
> -$ git whatchanged --patch-with-stat --summary master -- dir/
> +$ git whatchanged --patch-with-stat --summary main -- dir/
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master b/t/t4013/diff.whatchanged_--patch-with-stat_main
> similarity index 97%
> rename from t/t4013/diff.whatchanged_--patch-with-stat_master
> rename to t/t4013/diff.whatchanged_--patch-with-stat_main
> index 1ac431ba92..aabccf39a5 100644
> --- a/t/t4013/diff.whatchanged_--patch-with-stat_master
> +++ b/t/t4013/diff.whatchanged_--patch-with-stat_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --patch-with-stat master
> +$ git whatchanged --patch-with-stat main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
> similarity index 94%
> rename from t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
> rename to t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
> index b30c28588f..c05a0e8149 100644
> --- a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
> +++ b/t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
> @@ -1,4 +1,4 @@
> -$ git whatchanged --patch-with-stat master -- dir/
> +$ git whatchanged --patch-with-stat main -- dir/
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
> similarity index 97%
> rename from t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
> rename to t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
> index 30aae7817b..1f74b1b548 100644
> --- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --root --cc --patch-with-stat --summary master
> +$ git whatchanged --root --cc --patch-with-stat --summary main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
> similarity index 97%
> rename from t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
> rename to t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
> index db90e51525..80d9812151 100644
> --- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --root --patch-with-stat --summary master
> +$ git whatchanged --root --patch-with-stat --summary main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_main
> similarity index 97%
> rename from t/t4013/diff.whatchanged_--root_--patch-with-stat_master
> rename to t/t4013/diff.whatchanged_--root_--patch-with-stat_main
> index 9a6cc92ce7..c0b9082a2c 100644
> --- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master
> +++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --root --patch-with-stat master
> +$ git whatchanged --root --patch-with-stat main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
> similarity index 97%
> rename from t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
> rename to t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
> index d1d32bd34c..0002c6912e 100644
> --- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
> +++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --root -c --patch-with-stat --summary master
> +$ git whatchanged --root -c --patch-with-stat --summary main
>  commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
>  Merge: 9a6d494 c7a2ab9
>  Author: A U Thor <author@example.com>
> diff --git a/t/t4013/diff.whatchanged_--root_-p_master b/t/t4013/diff.whatchanged_--root_-p_main
> similarity index 98%
> rename from t/t4013/diff.whatchanged_--root_-p_master
> rename to t/t4013/diff.whatchanged_--root_-p_main
> index ebf1f0661e..39f3e2be74 100644
> --- a/t/t4013/diff.whatchanged_--root_-p_master
> +++ b/t/t4013/diff.whatchanged_--root_-p_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --root -p master
> +$ git whatchanged --root -p main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_--root_master b/t/t4013/diff.whatchanged_--root_main
> similarity index 97%
> rename from t/t4013/diff.whatchanged_--root_master
> rename to t/t4013/diff.whatchanged_--root_main
> index a405cb6138..36f4d6697f 100644
> --- a/t/t4013/diff.whatchanged_--root_master
> +++ b/t/t4013/diff.whatchanged_--root_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged --root master
> +$ git whatchanged --root main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_-SF_-p_master b/t/t4013/diff.whatchanged_-SF_-p_main
> similarity index 89%
> rename from t/t4013/diff.whatchanged_-SF_-p_master
> rename to t/t4013/diff.whatchanged_-SF_-p_main
> index f39da84822..0e2e67c0df 100644
> --- a/t/t4013/diff.whatchanged_-SF_-p_master
> +++ b/t/t4013/diff.whatchanged_-SF_-p_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged -SF -p master
> +$ git whatchanged -SF -p main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_-SF_master b/t/t4013/diff.whatchanged_-SF_main
> similarity index 86%
> rename from t/t4013/diff.whatchanged_-SF_master
> rename to t/t4013/diff.whatchanged_-SF_main
> index 0499321d0e..34c6bf6b95 100644
> --- a/t/t4013/diff.whatchanged_-SF_master
> +++ b/t/t4013/diff.whatchanged_-SF_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged -SF master
> +$ git whatchanged -SF main
>  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:02:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_-p_master b/t/t4013/diff.whatchanged_-p_main
> similarity index 98%
> rename from t/t4013/diff.whatchanged_-p_master
> rename to t/t4013/diff.whatchanged_-p_main
> index f18d43209c..18f3bdeef4 100644
> --- a/t/t4013/diff.whatchanged_-p_master
> +++ b/t/t4013/diff.whatchanged_-p_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged -p master
> +$ git whatchanged -p main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
> diff --git a/t/t4013/diff.whatchanged_master b/t/t4013/diff.whatchanged_main
> similarity index 97%
> rename from t/t4013/diff.whatchanged_master
> rename to t/t4013/diff.whatchanged_main
> index cd3bcc2c72..d6c83ed8b0 100644
> --- a/t/t4013/diff.whatchanged_master
> +++ b/t/t4013/diff.whatchanged_main
> @@ -1,4 +1,4 @@
> -$ git whatchanged master
> +$ git whatchanged main
>  commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
>  Author: A U Thor <author@example.com>
>  Date:   Mon Jun 26 00:03:00 2006 +0000
>
> base-commit: 7f7ebe054af6d831b999d6c2241b9227c4e4e08d
> --
> gitgitgadget
>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] t4013: prepare for the new default branch name "main"
  2020-11-11 21:43 ` Johannes Schindelin
@ 2020-11-11 21:49   ` Junio C Hamano
  2020-11-12 13:48     ` Johannes Schindelin
  0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2020-11-11 21:49 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: git, Johannes Schindelin via GitGitGadget

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?

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?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] t4013: prepare for the new default branch name "main"
  2020-11-11 21:49   ` Junio C Hamano
@ 2020-11-12 13:48     ` Johannes Schindelin
  2020-11-12 16:50       ` Junio C Hamano
  0 siblings, 1 reply; 5+ messages in thread
From: Johannes Schindelin @ 2020-11-12 13:48 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Johannes Schindelin via GitGitGadget

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] t4013: prepare for the new default branch name "main"
  2020-11-12 13:48     ` Johannes Schindelin
@ 2020-11-12 16:50       ` Junio C Hamano
  0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2020-11-12 16:50 UTC (permalink / raw)
  To: Johannes Schindelin; +Cc: git, Johannes Schindelin via GitGitGadget

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

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

Why doesn't it work after it?

Ahh, the top-level test repository at $TRASH_DIRECTORY may have
already been created with an unborn branch that is 'main'---but we
can easily rename it to a hardcoded value that the rest of the test
wants to see with just a little bit of code (see below).

> What's wrong with the test cases in t0001-init.sh ...

They are not wrong at all.  I am only saying there is no reason to
declare that no tests other than them are allowed to test with
different branch name.

But it seems that we do not even have to muck with $HOME/.gitconfig
or the configuration variable, as t4013 happily stays in the
initially created repository and conducts its various tests, without
creating secondary repositories.  What matters is on which branch
that Initial commit gets created in the 'setup' step.

Something along this line, but except the first two commented-out
commands that I added when testing manually without an updated
version of Git whose default is already changed to 'main', would
unbreak the tests, no?

 t/t4013-diff-various.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git c/t/t4013-diff-various.sh w/t/t4013-diff-various.sh
index f72d456d3b..b37e1e04cc 100755
--- c/t/t4013-diff-various.sh
+++ w/t/t4013-diff-various.sh
@@ -8,8 +8,23 @@ test_description='Various diff formatting options'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
+# git symbolic-ref HEAD refs/heads/main
+# git config init.defaultbranch main
+
 test_expect_success setup '
 
+	# Since there are too many references of "master" in the
+	# golden-master that output from the test commands is
+	# compared against, we fix (not in the sense to "correct",
+	# but in the sense to "make unmovable") the choice made
+	# in this test repository to use the historical branch name
+	# to avoid churning the test and affect in-flight topics.
+	git symbolic-ref HEAD refs/heads/master &&
+
+	# Just in case---we do not create separate repositories in
+	# this test, so it should not make any difference.
+	git config --global init.defaultbranch master &&
+
 	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
 	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-11-12 16:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2020-11-12 16:50       ` Junio C Hamano

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git