freshlybakedca.ke / git
Git fork
fork atom

sequencer: remove VERBATIM_MSG flag

As the last commit deleted the only user of VERBATIM_MSG remove
it. This reverts remaining parts of commit f7d42ceec52 (rebase -i:
do leave commit message intact in fixup! chains, 2021-01-28) that
were not deleted by the last commit.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Phillip Wood and committed by
Junio C Hamano 82a0a73e 5b44c3bd

-11
-11
sequencer.c
··· 1087 1087 #define CLEANUP_MSG (1<<3) 1088 1088 #define VERIFY_MSG (1<<4) 1089 1089 #define CREATE_ROOT_COMMIT (1<<5) 1090 - #define VERBATIM_MSG (1<<6) 1091 1090 1092 1091 static int run_command_silent_on_success(struct child_process *cmd) 1093 1092 { ··· 1125 1124 { 1126 1125 struct child_process cmd = CHILD_PROCESS_INIT; 1127 1126 1128 - if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG)) 1129 - BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive"); 1130 - 1131 1127 cmd.git_cmd = 1; 1132 1128 1133 1129 if (is_rebase_i(opts) && ··· 1166 1162 strvec_pushl(&cmd.args, "-C", "HEAD", NULL); 1167 1163 if ((flags & CLEANUP_MSG)) 1168 1164 strvec_push(&cmd.args, "--cleanup=strip"); 1169 - if ((flags & VERBATIM_MSG)) 1170 - strvec_push(&cmd.args, "--cleanup=verbatim"); 1171 1165 if ((flags & EDIT_MSG)) 1172 1166 strvec_push(&cmd.args, "-e"); 1173 1167 else if (!(flags & CLEANUP_MSG) && ··· 1540 1534 enum commit_msg_cleanup_mode cleanup; 1541 1535 int res = 0; 1542 1536 1543 - if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG)) 1544 - BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive"); 1545 - 1546 1537 if (parse_head(r, &current_head)) 1547 1538 return -1; 1548 1539 ··· 1618 1609 1619 1610 if (flags & CLEANUP_MSG) 1620 1611 cleanup = COMMIT_MSG_CLEANUP_ALL; 1621 - else if (flags & VERBATIM_MSG) 1622 - cleanup = COMMIT_MSG_CLEANUP_NONE; 1623 1612 else if ((opts->signoff || opts->record_origin) && 1624 1613 !opts->explicit_cleanup) 1625 1614 cleanup = COMMIT_MSG_CLEANUP_SPACE;