[RFC PATCH 1/9] rebase -i: only write fixup-message when it's needed
flat view
STALE2088d
SUPERSEDED
From: Charvi Mendiratta <hidden>
Date: 2021-01-08 09:26:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision rfc of 5 in this series.
Revisions (5)
- rfc current
- rfc
- v3 [diff vs current]
- v4 [diff vs current]
- v5 [diff vs current]
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> Signed-off-by: Charvi Mendiratta <redacted> --- sequencer.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 8909a46770..f888a7ed3b 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -1757,11 +1757,13 @@ 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)) { - unuse_commit_buffer(head_commit, head_message); - return error(_("cannot write '%s'"), - rebase_path_fixup_msg()); + if (command == TODO_FIXUP) { + if (write_message(body, strlen(body), + rebase_path_fixup_msg(), 0)) { + unuse_commit_buffer(head_commit, head_message); + return error(_("cannot write '%s'"), + rebase_path_fixup_msg()); + } } strbuf_addf(&buf, "%c ", comment_line_char);
--
2.29.0.rc1