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>
Phillip Wood committed
Sep 18, 2025 at 10:00 UTC
82a0a73e15042008fe6c4b145a8b1c34ee135753
1 file changed
-11
sequencer.c
-11
@@ -1087,7 +1087,6 @@ N_("you have staged changes in your working tree\n"
1087
#define CLEANUP_MSG (1<<3)
1088
#define VERIFY_MSG (1<<4)
1089
#define CREATE_ROOT_COMMIT (1<<5)
1090
-#define VERBATIM_MSG (1<<6)
1090
1091
static int run_command_silent_on_success(struct child_process *cmd)
1092
{
@@ -1125,9 +1124,6 @@ static int run_git_commit(const char *defmsg,
1124
{
1125
struct child_process cmd = CHILD_PROCESS_INIT;
1126
1128
- if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG))
1129
- BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");
1130
-
1127
cmd.git_cmd = 1;
1128
1129
if (is_rebase_i(opts) &&
@@ -1166,8 +1162,6 @@ static int run_git_commit(const char *defmsg,
1162
strvec_pushl(&cmd.args, "-C", "HEAD", NULL);
1163
if ((flags & CLEANUP_MSG))
1164
strvec_push(&cmd.args, "--cleanup=strip");
1169
- if ((flags & VERBATIM_MSG))
1170
- strvec_push(&cmd.args, "--cleanup=verbatim");
1165
if ((flags & EDIT_MSG))
1166
strvec_push(&cmd.args, "-e");
1167
else if (!(flags & CLEANUP_MSG) &&
@@ -1540,9 +1534,6 @@ static int try_to_commit(struct repository *r,
1534
enum commit_msg_cleanup_mode cleanup;
1535
int res = 0;
1536
1543
- if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG))
1544
- BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");
1545
-
1537
if (parse_head(r, ¤t_head))
1538
return -1;
1539
@@ -1618,8 +1609,6 @@ static int try_to_commit(struct repository *r,
1609
1610
if (flags & CLEANUP_MSG)
1611
cleanup = COMMIT_MSG_CLEANUP_ALL;
1621
- else if (flags & VERBATIM_MSG)
1622
- cleanup = COMMIT_MSG_CLEANUP_NONE;
1612
else if ((opts->signoff || opts->record_origin) &&
1613
!opts->explicit_cleanup)
1614
cleanup = COMMIT_MSG_CLEANUP_SPACE;