Re: [PATCH v2 2/2] commit: allow -c/-C for all kinds of --fixup

From: Erik Cervin Edin <erik@cervined.in>
Date: Sep 4, 2026, 18:47 UTC
Message-ID: <CA+JQ7M__GOnM9LHt0txry-G2z2CKhdZr0b-rU=Yd_A0gCEwmaQ@mail.gmail.com>
In-Reply-To: <xmqq1pbkefh0.fsf@gitster.g>

On Wed, 26 Aug 2026 at 23:31, Junio C Hamano <gitster@pobox.com> wrote:

> Sorry, but this topic has been hanging without getting any reviews
> on the list for quite a while.
>
> Any takers?

I'm a little unfamiliar with this part of the mailing list, but yes, it's been a while. I've been assuming people are busy with other things, which is ofc okay. If there's anything I can do on my side to help make this easier I'm happy to. I may be slow to respond since I check this thread less frequently these days.

FWIW I've been dogfooding these options to reword commit messages the last few months and found it pretty useful so far.

Show 19 quoted lines

> One small thing I noticed appears here:
>
> > @@ -1341,7 +1346,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
> >               die(_("options '%s' and '%s' cannot be used together"), "--squash", "--fixup");
> >       die_for_incompatible_opt3(!!use_message, "-C",
> >                                 !!edit_message, "-c",
> > -                               !!fixup_message, "--fixup");
> > +                               !!logfile, "-F");
> >       die_for_incompatible_opt4(have_option_m, "-m",
> >                                 !!edit_message, "-c",
> >                                 !!use_message, "-C",
>
> This blocks -C, -c, -F from being used together.  But the next
> opt4() covers these combinations already:
>
>         die_for_incompatible_opt4(have_option_m, "-m",
>                                   !!edit_message, "-c",
>                                   !!use_message, "-C",
>                                   !!logfile, "-F")

That looks like it's worth a second look. I'll be away for a few weeks but I'll take a look at that when I get back.