"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: Johannes Schindelin <johannes.schindelin@xxxxxx> > > In the context of many projects renaming their primary branch names away > from `master`, Git wants to stop treating the `master` branch specially. > > Let's start with `git fmt-merge-msg`. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> > --- > fmt-merge-msg.c | 5 +- > t/t1507-rev-parse-upstream.sh | 2 +- > t/t4013-diff-various.sh | 4 +- > t/t4013/diff.log_--decorate=full_--all | 2 +- > t/t4013/diff.log_--decorate_--all | 2 +- > ...--patch-with-stat_--summary_master_--_dir_ | 2 +- > t/t4013/diff.log_--patch-with-stat_master | 2 +- > .../diff.log_--patch-with-stat_master_--_dir_ | 2 +- > ...ot_--cc_--patch-with-stat_--summary_master | 2 +- > ..._--root_--patch-with-stat_--summary_master | 2 +- > .../diff.log_--root_--patch-with-stat_master | 2 +- > ...root_-c_--patch-with-stat_--summary_master | 2 +- > t/t4013/diff.log_--root_-p_master | 2 +- > t/t4013/diff.log_--root_master | 2 +- > t/t4013/diff.log_-m_-p_--first-parent_master | 2 +- > t/t4013/diff.log_-m_-p_master | 4 +- > t/t4013/diff.log_-p_--first-parent_master | 2 +- > t/t4013/diff.log_-p_master | 2 +- > t/t4013/diff.log_master | 2 +- > t/t4013/diff.show_--first-parent_master | 2 +- > t/t4013/diff.show_-c_master | 2 +- > t/t4013/diff.show_-m_master | 4 +- > t/t4013/diff.show_master | 2 +- > ...ot_--cc_--patch-with-stat_--summary_master | 2 +- > ...root_-c_--patch-with-stat_--summary_master | 2 +- > t/t4202-log.sh | 72 +++++++++---------- > t/t6200-fmt-merge-msg.sh | 36 +++++----- > t/t7600-merge.sh | 14 ++-- > t/t7608-merge-messages.sh | 10 +-- > 29 files changed, 94 insertions(+), 97 deletions(-) This must have been tedious as the tests with merge commits are all over the place (I know updating t4013 would not have been too much of the work as it has its own self-update knob, but it still is a lot of work to verify that the changes make sense). Thanks.
