[PATCH v3 3/4] merge: split write_merge_state in two
- From
Michael J Gruber <git@grubix.eu>
- Date
- Aug 23, 2017, 12:10 UTC
- Message-ID
- <5e23092c21b834424f7a9bb0a0fc01c0a729293d.1503489842.git.git@grubix.eu>
- In-Reply-To
- <xmqq1so34m6d.fsf@gitster.mtv.corp.google.com>
write_merge_state() writes out the merge heads, mode, and msg. But we may want to write out heads, mode without the msg. So, split out heads (+mode) into a separate function write_merge_heads() that is called by write_merge_state().
No funtional change so far, except when these non-atomic writes are interrupted: we write heads-mode-msg now when we used to write heads-msg-mode.
Signed-off-by: Michael J Gruber <git@grubix.eu> --- builtin/merge.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c index dafec80fa9..db3335b3bf 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -910,7 +910,7 @@ static int setup_with_upstream(const char ***argv) return i; } -static void write_merge_state(struct commit_list *remoteheads) +static void write_merge_heads(struct commit_list *remoteheads) { struct commit_list *j; struct strbuf buf = STRBUF_INIT; @@ -926,8 +926,6 @@ static void write_merge_state(struct commit_list *remoteheads) strbuf_addf(&buf, "%s\n", oid_to_hex(oid)); } write_file_buf(git_path_merge_head(), buf.buf, buf.len); - strbuf_addch(&merge_msg, '\n'); - write_file_buf(git_path_merge_msg(), merge_msg.buf, merge_msg.len); strbuf_reset(&buf); if (fast_forward == FF_NO) @@ -935,6 +933,13 @@ static void write_merge_state(struct commit_list *remoteheads) write_file_buf(git_path_merge_mode(), buf.buf, buf.len); } +static void write_merge_state(struct commit_list *remoteheads) +{ + write_merge_heads(remoteheads); + strbuf_addch(&merge_msg, '\n'); + write_file_buf(git_path_merge_msg(), merge_msg.buf, merge_msg.len); +} + static int default_edit_option(void) { static const char name[] = "GIT_MERGE_AUTOEDIT";
-- 2.14.1.426.g4352aa77a5