Re: [PATCH v3 2/6] commit: add amend suboption to --fixup to create amend! commit

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 1, 2021, 18:34 UTC
Message-ID: <xmqqlfb6radq.fsf@gitster.c.googlers.com>
In-Reply-To: <20210301084512.27170-3-charvi077@gmail.com>

Charvi Mendiratta <charvi077@gmail.com> writes:

> +static int prepare_amend_commit(struct commit *commit, struct strbuf *sb,
> +								 struct pretty_print_context *ctx) {

Why does this need to be overly indented? Are you using some funny tab width settings? In this project, a tab stop is 8-spaces wide.

> +		/*
> +		 * Only `-m` commit message option is checked here, as
> +		 * it supports `--fixup` to append the commit message.

As it is OK to use "-m" with the plain vanilla "--fixup", an earlier check did not reject the combination, but now we look at what kind of fixup it is, and error out if it is "--fixup=amend:". OK.

Show 5 quoted lines

> +		 * The other commit message options `-c`/`-C`/`-F` are
> +		 * incompatible with all the forms of `--fixup` and
> +		 * have already errored out while parsing the `git commit`
> +		 * options.
> +		 */