From: "Lidong Yan via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Phillip Wood <phillip.wood123@gmail.com>,
Lidong Yan <502024330056@smail.nju.edu.cn>
Subject: [PATCH v3 0/2] sequencer: replace error() with BUG() in update_squash_messages()
Date: Fri, 30 May 2025 01:52:33 +0000 [thread overview]
Message-ID: <pull.1964.v3.git.git.1748569955.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1964.v2.git.git.1748168353204.gitgitgadget@gmail.com>
Lidong Yan (2):
sequencer: replace error() with BUG() in update_squash_messages()
BUG(): remove leading underscore of the format string
builtin/mktag.c | 2 +-
builtin/worktree.c | 2 +-
pack-bitmap-write.c | 2 +-
sequencer.c | 6 ++++--
4 files changed, 7 insertions(+), 5 deletions(-)
base-commit: fcfe60668e05ffde2610bfef9045797618c145ac
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1964%2Fbrandb97%2Ffix-sequencer-leak-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1964/brandb97/fix-sequencer-leak-v3
Pull-Request: https://github.com/git/git/pull/1964
Range-diff vs v2:
1: aa5ff030b37 ! 1: b812f973d18 sequencer: replace error() with BUG() in update_squash_messages()
@@ Commit message
## sequencer.c ##
@@ sequencer.c: static int update_squash_messages(struct repository *r,
+ const char *message, *body;
+ const char *encoding = get_commit_output_encoding();
+
++ if (!is_fixup(command))
++ BUG("unknown command: %d", command);
++
+ if (ctx->current_fixup_count > 0) {
+ struct strbuf header = STRBUF_INIT;
+ char *eol;
+@@ sequencer.c: static int update_squash_messages(struct repository *r,
+ strbuf_addstr(&buf, "\n\n");
strbuf_add_commented_lines(&buf, body, strlen(body),
comment_line_str);
- } else
+- } else
- return error(_("unknown command: %d"), command);
-+ BUG(_("unknown command: %d"), command);
++ }
repo_unuse_commit_buffer(r, commit, message);
if (!res)
-: ----------- > 2: e1f84c111f6 BUG(): remove leading underscore of the format string
--
gitgitgadget
next prev parent reply other threads:[~2025-05-30 1:52 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-14 12:44 [PATCH] sequencer: fix memory leak if `update_squash_messages()` failed Lidong Yan via GitGitGadget
2025-05-15 10:08 ` Phillip Wood
2025-05-15 16:20 ` Junio C Hamano
2025-05-15 16:43 ` lidongyan
2025-05-25 10:19 ` [PATCH v2] sequencer: replace error() with BUG() in update_squash_messages() Lidong Yan via GitGitGadget
2025-05-28 22:16 ` Junio C Hamano
2025-05-29 13:39 ` Phillip Wood
2025-05-30 4:29 ` Junio C Hamano
2025-06-02 13:59 ` Phillip Wood
2025-05-30 1:52 ` Lidong Yan via GitGitGadget [this message]
2025-05-30 1:52 ` [PATCH v3 1/2] " Lidong Yan via GitGitGadget
2025-05-30 13:35 ` Junio C Hamano
2025-05-30 1:52 ` [PATCH v3 2/2] BUG(): remove leading underscore of the format string Lidong Yan via GitGitGadget
2025-05-30 13:15 ` Junio C Hamano
2025-06-03 2:01 ` [PATCH v4 0/2] sequencer: replace error() with BUG() in update_squash_messages() Lidong Yan via GitGitGadget
2025-06-03 2:01 ` [PATCH v4 1/2] " Lidong Yan via GitGitGadget
2025-06-03 2:01 ` [PATCH v4 2/2] BUG(): remove leading underscore of the format string Lidong Yan via GitGitGadget
2025-06-03 17:40 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1964.v3.git.git.1748569955.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=502024330056@smail.nju.edu.cn \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.