Re: [PATCH v2 3/3] am: let --signoff override --no-signoff

From: Paul Tan <pyokagan@gmail.com>
Date: Aug 12, 2015, 03:06 UTC
Message-ID: <CACRoPnSmeR9ETZ4M6GqkbtEZxM-_J-Dxgsx34ntPnojM1j0ZqQ@mail.gmail.com>
In-Reply-To: <16ad6c2da8f85b9f5fc26ee6ebad944b@www.dscho.org>

On Fri, Aug 7, 2015 at 5:29 PM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:

Show 15 quoted lines

>> diff --git a/builtin/am.c b/builtin/am.c
>> index 0961304..8c95aec 100644
>> --- a/builtin/am.c
>> +++ b/builtin/am.c
>> @@ -2265,6 +2284,9 @@ int cmd_am(int argc, const char **argv, const
>> char *prefix)
>>
>>               if (resume == RESUME_FALSE)
>>                       resume = RESUME_APPLY;
>> +
>> +             if (state.signoff == SIGNOFF_EXPLICIT)
>> +                     am_append_signoff(&state);
>>       } else {
>
> This is clever, but I suspect there is now a chance for a double-signoff if we passed `--signoff` to the initial `git am` call and it went through without having to resume.

It's not present in this diff context, but this hunk modifies the code path where in_progress is true. In other words, we only check for SIGNOFF_EXPLICIT if