kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sequencer: replace error() with BUG() in update_squash_messages () 

In sequencer.c, caller only pass TODO_SQUASH or TODO_FIXUP to
update_squash_messages(), any other command passed in should be
considered as BUG. Replace `return error('unknown command')`
with `BUG('not a FIXUP or SQUASH')`.

Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Lidong Yan 2025-06-03 02:01:13 +00:00 committed by Junio C Hamano
parent b07857f7dc
commit 8b34b6a220
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sequencer.c
View File

@ -2067,6 +2067,9 @@ static int update_squash_messages(struct repository *r,
const char *message, *body; const char *message, *body;
const char *encoding = get_commit_output_encoding(); const char *encoding = get_commit_output_encoding();


if (!is_fixup(command))
BUG("not a FIXUP or SQUASH %d", command);

if (ctx->current_fixup_count > 0) { if (ctx->current_fixup_count > 0) {
struct strbuf header = STRBUF_INIT; struct strbuf header = STRBUF_INIT;
char *eol; char *eol;
@ -2134,8 +2137,7 @@ static int update_squash_messages(struct repository *r,
strbuf_addstr(&buf, "\n\n"); strbuf_addstr(&buf, "\n\n");
strbuf_add_commented_lines(&buf, body, strlen(body), strbuf_add_commented_lines(&buf, body, strlen(body),
comment_line_str); comment_line_str);
} else }
return error(_("unknown command: %d"), command);
repo_unuse_commit_buffer(r, commit, message); repo_unuse_commit_buffer(r, commit, message);


if (!res) if (!res)