undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
00906d6f22
git-commit-vandalism/t/t4013
History
Junio C Hamano 21531927e4 Revert "fmt-merge-msg: stop treating master specially" 
This reverts commit 489947cee5, which
stopped treating merges into the 'master' branch as special when
preparing the default merge message.  As the goal was not to have
any single branch designated as special, it solved it by leaving the
"into <branchname>" at the end of the title of the default merge
message for any and all branches.  An obvious and easy alternative
to treat everybody equally could have been to remove it for every
branch, but that involves loss of information.

We'll introduce a new mechanism to let end-users specify merges into
which branches would omit the "into <branchname>" from the title of
the default merge message, and make the mechanism, when unconfigured,
treat the traditional 'master' special again, so all the changes to
the tests we made earlier will become unnecessary, as these tests
will be run without configuring the said new mechanism.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-07-30 12:41:49 -07:00
..
diff.config_format.subjectprefix_DIFFERENT_PREFIX
diff.diff_--abbrev_initial..side
diff.diff_--cached
diff.diff_--cached_--_file0
diff.diff_--dirstat_--cc_master~1_master
diff.diff_--dirstat_initial_rearrange
diff.diff_--dirstat_master~1_master~2
diff.diff_--dirstat-by-file_initial_rearrange
diff.diff_--line-prefix_--cached_--_file0
diff.diff_--line-prefix=abc_master_master^_side
diff.diff_--name-status_dir2_dir
diff.diff_--no-index_--name-status_--_dir2_dir
diff.diff_--no-index_--name-status_dir2_dir
diff.diff_--no-index_--raw_--abbrev=4_dir2_dir
diff.diff_--no-index_--raw_--no-abbrev_dir2_dir
diff.diff_--no-index_--raw_dir2_dir
diff.diff_--no-index_dir_dir3
diff.diff_--patch-with-raw_-r_initial..side
diff.diff_--patch-with-raw_initial..side
diff.diff_--patch-with-stat_-r_initial..side
diff.diff_--patch-with-stat_initial..side
diff.diff_--raw_--abbrev=4_initial
diff.diff_--raw_--no-abbrev_initial
diff.diff_--raw_initial
diff.diff_--stat_initial..side
diff.diff_-r_--stat_initial..side
diff.diff_-r_initial..side
diff.diff_-U1_initial..side
diff.diff_-U2_initial..side
diff.diff_-U_initial..side
diff.diff_initial..side
diff.diff_master_master^_side
diff.diff-tree_--cc_--patch-with-stat_--summary_master
diff.diff-tree_--cc_--patch-with-stat_--summary_side
diff.diff-tree_--cc_--patch-with-stat_master
diff.diff-tree_--cc_--shortstat_master
diff.diff-tree_--cc_--stat_--summary_master
diff.diff-tree_--cc_--stat_--summary_side
diff.diff-tree_--cc_--stat_master
diff.diff-tree_--cc_--summary_REVERSE
diff.diff-tree_--cc_master
diff.diff-tree_--format=%N_note
diff.diff-tree_--patch-with-raw_initial
diff.diff-tree_--patch-with-stat_initial
diff.diff-tree_--pretty_--notes_note
diff.diff-tree_--pretty_--patch-with-raw_initial
diff.diff-tree_--pretty_--patch-with-stat_initial
diff.diff-tree_--pretty_--patch-with-stat_side
diff.diff-tree_--pretty_--root_--patch-with-raw_initial
diff.diff-tree_--pretty_--root_--patch-with-stat_initial
diff.diff-tree_--pretty_--root_--stat_--compact-summary_initial
diff.diff-tree_--pretty_--root_--stat_--summary_initial
diff.diff-tree_--pretty_--root_--stat_initial
diff.diff-tree_--pretty_--root_--summary_-r_initial
diff.diff-tree_--pretty_--root_--summary_initial
diff.diff-tree_--pretty_--root_-p_initial
diff.diff-tree_--pretty_--root_initial
diff.diff-tree_--pretty_--stat_--summary_initial
diff.diff-tree_--pretty_--stat_initial
diff.diff-tree_--pretty_--summary_initial
diff.diff-tree_--pretty_-p_initial
diff.diff-tree_--pretty_-p_side
diff.diff-tree_--pretty_-R_--root_--stat_--compact-summary_initial
diff.diff-tree_--pretty_initial
diff.diff-tree_--pretty_note
diff.diff-tree_--pretty_side
diff.diff-tree_--pretty=oneline_--patch-with-raw_initial
diff.diff-tree_--pretty=oneline_--patch-with-stat_initial
diff.diff-tree_--pretty=oneline_--root_--patch-with-raw_initial
diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
diff.diff-tree_--pretty=oneline_--root_-p_initial
diff.diff-tree_--pretty=oneline_--root_initial
diff.diff-tree_--pretty=oneline_-p_initial
diff.diff-tree_--pretty=oneline_initial
diff.diff-tree_--root_--abbrev_initial
diff.diff-tree_--root_--patch-with-raw_initial
diff.diff-tree_--root_--patch-with-stat_initial
diff.diff-tree_--root_-p_initial
diff.diff-tree_--root_-r_--abbrev_initial
diff.diff-tree_--root_-r_--abbrev=4_initial
diff.diff-tree_--root_-r_initial
diff.diff-tree_--root_initial
diff.diff-tree_--stat_--compact-summary_initial_mode
diff.diff-tree_--stat_initial_mode
diff.diff-tree_--summary_initial_mode
diff.diff-tree_-c_--abbrev_master
diff.diff-tree_-c_--stat_--summary_master
diff.diff-tree_-c_--stat_--summary_side
diff.diff-tree_-c_--stat_master
diff.diff-tree_-c_master
diff.diff-tree_-p_-m_master
diff.diff-tree_-p_initial
diff.diff-tree_-p_master
diff.diff-tree_-r_--abbrev_initial
diff.diff-tree_-r_--abbrev=4_initial
diff.diff-tree_-R_--stat_--compact-summary_initial_mode
diff.diff-tree_-r_initial
diff.diff-tree_initial
diff.diff-tree_initial_mode
diff.diff-tree_master
diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
diff.format-patch_--attach_--stdout_initial..master
diff.format-patch_--attach_--stdout_initial..master^
diff.format-patch_--attach_--stdout_initial..side
diff.format-patch_--inline_--stdout_--numbered-files_initial..master
diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
diff.format-patch_--inline_--stdout_initial..master
diff.format-patch_--inline_--stdout_initial..master^
diff.format-patch_--inline_--stdout_initial..master^^
diff.format-patch_--inline_--stdout_initial..side
diff.format-patch_--stdout_--cover-letter_-n_initial..master^
diff.format-patch_--stdout_--no-numbered_initial..master
diff.format-patch_--stdout_--numbered_initial..master
diff.format-patch_--stdout_initial..master
diff.format-patch_--stdout_initial..master^
diff.format-patch_--stdout_initial..side
diff.log_--decorate_--all Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--decorate=full_--all Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--patch-with-stat_--summary_master_--_dir_ Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--patch-with-stat_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--patch-with-stat_master_--_dir_ Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--root_--cc_--patch-with-stat_--summary_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--root_--patch-with-stat_--summary_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--root_--patch-with-stat_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--root_-c_--patch-with-stat_--summary_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--root_-p_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_--root_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_-GF_-p_--pickaxe-all_master
diff.log_-GF_-p_master
diff.log_-GF_master
diff.log_-m_-p_--first-parent_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_-m_-p_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_-p_--first-parent_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_-p_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.log_-S_F_master
diff.log_-SF_-p_master
diff.log_-SF_master
diff.log_-SF_master_--max-count=0
diff.log_-SF_master_--max-count=1
diff.log_-SF_master_--max-count=2
diff.log_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir
diff.noellipses-diff_--no-index_--raw_dir2_dir
diff.noellipses-diff_--patch-with-raw_-r_initial..side
diff.noellipses-diff_--patch-with-raw_initial..side
diff.noellipses-diff_--raw_--abbrev=4_initial
diff.noellipses-diff_--raw_initial
diff.noellipses-diff-tree_--root_--abbrev_initial
diff.noellipses-diff-tree_--root_-r_--abbrev_initial
diff.noellipses-diff-tree_--root_-r_--abbrev=4_initial
diff.noellipses-diff-tree_-c_--abbrev_master
diff.noellipses-show_--patch-with-raw_side
diff.noellipses-whatchanged_--root_master
diff.noellipses-whatchanged_-SF_master
diff.noellipses-whatchanged_master
diff.rev-list_--children_HEAD
diff.rev-list_--parents_HEAD
diff.show_--first-parent_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.show_--patch-with-raw_side
diff.show_--patch-with-stat_--summary_side
diff.show_--patch-with-stat_side
diff.show_--root_initial
diff.show_--stat_--summary_side
diff.show_--stat_side
diff.show_-c_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.show_-m_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.show_initial
diff.show_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.show_side
diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
diff.whatchanged_--patch-with-stat_master
diff.whatchanged_--patch-with-stat_master_--_dir_
diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.whatchanged_--root_--patch-with-stat_--summary_master
diff.whatchanged_--root_--patch-with-stat_master
diff.whatchanged_--root_-c_--patch-with-stat_--summary_master Revert "fmt-merge-msg: stop treating master specially" 2020-07-30 12:41:49 -07:00
diff.whatchanged_--root_-p_master
diff.whatchanged_--root_master
diff.whatchanged_-p_master
diff.whatchanged_-SF_-p_master
diff.whatchanged_-SF_master
diff.whatchanged_master