From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 27 Jul 2011 10:19:43 GMT
Subject: Re: [PATCH 11/18] revert: Save data for continuing after conflict resolution
Message-ID: <CALkWK0=uA1ZRsmiVwmx_3HXL-v+Bi-ONPEk5kMsh1RG0ZeVQJg@mail.gmail.com>
In-Reply-To: <20110727050220.GG18470@elie>

Hi,

Jonathan Nieder writes:
> Ramkumar Ramachandra wrote:
>> @@ -59,6 +60,11 @@ struct replay_opts {
>>  };
>>
>>  #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
>> +#define MAYBE_UNUSED __attribute__((__unused__))
> [...]
>> +}
>> +
>> +static void MAYBE_UNUSED read_populate_todo(struct commit_list **todo_list,
>> +                                     struct replay_opts *opts)
>
> This MAYBE_UNUSED with no conditional involved feels ugly.  Why is it
> needed?  Why not define read_populate_todo in the patch that first
> uses it, or barring that, tolerate a warning in this step within the
> patch series?

Junio complained about the warnings here [1], so I added MAYBE_UNUSED
to suppress them temporarily.  Would you really like to see
read_populate_todo and read_populate_opts being introduced MUCH later
in the '--continue' patch?

[1]: http://thread.gmane.org/gmane.comp.version-control.git/176899

Thanks.

-- Ram