Re: [PATCH 11/18] revert: Save data for continuing after conflict resolution

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]