[PATCH v5 1/8] rebase -i: only write fixup-message when it's needed
flat view
STALE2073d
REVIEWED: 1 (0M)
From: Charvi Mendiratta <hidden>
Date: 2021-02-04 19:06:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v5 of 5 in this series; 1 review trailer.
Revisions (5)
From: Phillip Wood <redacted> The file "$GIT_DIR/rebase-merge/fixup-message" is only used for fixup commands, there's no point in writing it for squash commands as it is immediately deleted. Signed-off-by: Phillip Wood <redacted> Reviewed-by: Taylor Blau <redacted> Signed-off-by: Charvi Mendiratta <redacted> --- sequencer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 8909a46770..a59e0c84af 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -1757,11 +1757,10 @@ static int update_squash_messages(struct repository *r, return error(_("could not read HEAD's commit message")); find_commit_subject(head_message, &body); - if (write_message(body, strlen(body), - rebase_path_fixup_msg(), 0)) { + if (command == TODO_FIXUP && write_message(body, strlen(body), + rebase_path_fixup_msg(), 0) < 0) { unuse_commit_buffer(head_commit, head_message); - return error(_("cannot write '%s'"), - rebase_path_fixup_msg()); + return error(_("cannot write '%s'"), rebase_path_fixup_msg()); } strbuf_addf(&buf, "%c ", comment_line_char);
--
2.29.0.rc1