Phillip Wood <phillip.wood123@xxxxxxxxx> writes: > + struct replay_ctx *ctx = opts->ctx; > + > + /* > + * Write the commit message to be used by "git rebase > + * --continue". If a "fixup" or "squash" command has conflicts > + * then we will have already written rebase_path_message() in > + * error_failed_squash(). If an "edit" command was > + * fast-forwarded then we don't have a message in ctx->message > + * and rely on make_patch() to write rebase_path_message() > + * instead. > + */ > + if (ctx->have_message && !file_exists(rebase_path_message()) && > + write_message(ctx->message.buf, ctx->message.len, > + rebase_path_message(), 0)) > + return error(_("could not write commit message file")); Makes the readers wonder if there are cases where we have written to disc, but .have_message is true and the on-disc contents and in-core contents are different. If a codepath that writes to the file had the message in-core, and it needs to tweak the message (e.g., add a sign-off trailer) before writing it out to the file but forgot to do so, then later we have tweaked the message in-core, such a bug would result in the necessary "tweak" we have done not appear on disc. Optionally keeping an in-core copy of what we have on disc does not directly reduces the possibility of introducing such a bug, and I am wondering if we can do anything clever about it. Thanks.