Re: [PATCH v3 1/4] rebase -i: mark commits that begin empty in todo editor

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 15, 2020, 20:52 UTC
Message-ID: <xmqqd0885v4u.fsf@gitster.c.googlers.com>
In-Reply-To: <0d94eea376a65304bc31fd1841216a04b5c15709.1586573067.git.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 16 quoted lines

> diff --git a/sequencer.c b/sequencer.c
> index e528225e787..ce9fd27a878 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -4656,6 +4656,9 @@ static int make_script_with_merges(struct pretty_print_context *pp,
>  			strbuf_addf(&buf, "%s %s %s", cmd_pick,
>  				    oid_to_hex(&commit->object.oid),
>  				    oneline.buf);
> +			if (is_empty)
> +				strbuf_addf(&buf, " %c empty",
> +					    comment_line_char);
> ...
> @@ -4861,6 +4864,8 @@ int sequencer_make_script(struct repository *r, struct strbuf *out,>  		pretty_print_commit(&pp, commit, out);
> +		if (is_empty)
> +			strbuf_addf(out, " %c empty", comment_line_char);
>  		strbuf_addch(out, '\n');

While I was re-reviewing the topics in flight, it occurred to me that this change may hurt automation if people feed the insn file to their own machinery to process, as the title in "git log --oneline" and in the file no longer matches. I am not sure how big a deal is (even when I am scripting, I only use the commit object name and ignore the title string, but there are people with diferent taste in this world, so...). It might be safer to add this as a comment on its own line, next to the usual "pick <commit> <title>" line, but I dunno.

This is more about raising awareness of possible regression than a suggestion to change anything.

Thanks.