Re: [PATCH v2 2/3] merge: split write_merge_state in two
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 22, 2017, 00:20 UTC
- Message-ID
- <xmqqshgk4fnt.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1fa72c32925d98a5ce8c96a2b504b2e4278dcfff.1503319519.git.git@grubix.eu>
Michael J Gruber <git@grubix.eu> writes:
Show 6 quoted lines
> 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.
"We may want to" leaves readers in suspense. Hopefully 3/3 makes it clear why we may in what situation.
One thing this changes is that we used to write merge-heads first, then message and then finally mode, but now we write merge-heads, then mode and finally message. So killing us in the middle may leave different set of files on the filesystem. It is unclear from the above description and the patch text if that is a potential issue.
Let's keep reading ;-)
Thanks.
Show 42 quoted lines
>
> 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 cc57052993..86f0adde3b 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -908,7 +908,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;
> @@ -924,8 +924,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)
> @@ -933,6 +931,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";