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 stringLidong Yan via GitGitGadget <gitgitgadget@gmail.com>