On 11/12/17 23:44, Junio C Hamano wrote: > Phillip Wood <phillip.wood@xxxxxxxxxxxx> writes: > >> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> >> I've reworked the config handling since v4. It now stores the default >> values in struct replay_opt rather than using global variables and >> calls git_diff_basic_config(). Unfortunately I've not had time to >> modify git_gpg_config() to indicate if it successfully handled the key >> so git_diff_basic_config() is called unnecessarily in that case. Within >> git_diff_basic_config() userdiff_config() also suffers from the same >> problem of not indicating if it has handled the key. > > Ouch. I thought we agreed that we were ready to go incremental and > the topic was merged to 'next' earlier last week. Sorry, I thought we were waiting, not to worry. > > After scanning the difference between the two rounds, it seems that > the more important difference is the rework of the configuration, > which looks better thought out than the previous round, and with > associated change to use replay_opts fields instead of free variables > to carry gpg-sign and cleanup-mode settings around, which also looks > sensible to me. Yes the configuration is the major change, I'm glad you think it is an improvement > Can you make these differences into incremental "that earlier one > was suboptimal for this and that reasons, let's make it better by > doing this" patches to queue them on top? Will do, though if I don't get round to it today or tomorrow it may be the New Year before I send them, I hope that's OK Best Wishes Phillip > Thanks. >
