Re: What's cooking in git.git (Nov 2021, #07; Mon, 29)

From: Elijah Newren <newren@gmail.com>
Date: Nov 30, 2021, 23:45 UTC
Message-ID: <CABPp-BE4uYBFnb-AgVJhNo6iK4da5hiEFEBhd=7Ea3Ov=4K4zw@mail.gmail.com>
In-Reply-To: <xmqqzgpm2xrd.fsf@gitster.g>

On Tue, Nov 30, 2021 at 6:49 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

>
> * xw/am-empty (2021-11-22) 2 commits
>  - am: support --empty=<option> to handle empty patches
>  - doc: git-format-patch: describe the option --always
>
>  "git am" learns "--empty=(die|drop|keep)" option to tweak what is
>  done to a piece of e-mail without a patch in it.
>
>  Will merge to 'next'.

Please don't, at least not this version. There have been newer submissions with three commits.

I also still find the word 'die' confusing, since to me it suggests aborting the whole am operation, and the documentation does not dispel that concern. Even if you don't like 'ask' (for consistency with git-rebase), I think 'stop' or 'interrupt' would be much better options than 'die'. If you really want it to be 'die', I think the behavior needs to be explained in the documentation, rather than just assumed that users will understand it (because I didn't understand it until I read the code).