On Wed, Apr 5, 2023 at 8:22 AM Phillip Wood <phillip.wood123@xxxxxxxxx> wrote: > > From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> > > Cleanup the handling of --strategy-option now that we no longer need to > support "--preserve-merges" and properly quote the argument when saving > it to disc. > > Thanks to Elijah for his comments on V1. > > Changes since V1: > > I've rebased these patches onto 'master' to avoid conflicts with > 'sg/parse-options-h-initializers' in the new patch 2 (this series > depends on 'ab/fix-strategy-opts-parsing' but that has now been merged > to master). > > Patch 1 - Unchanged. > > Patch 2 - New patch to store the merge strategy options in an "struct > strvec". This patch also introduces a new macro OPT_STRVEC() > to collect options into an "struct strvec". > > Patch 3 - Small simplification due to the changes in patch 2. > > Patch 4 - Moved the code to quote a list so it can split by > split_cmdline() into a new function quote_cmdline() as > suggested by Elijah. > > Patch 5 - Reworded the commit message as suggested by Elijah. I noticed a small typo/grammo in the commit message of Patch 4 that I missed in V1, but otherwise this series looks good. I'm not sure fixing the tiny grammo is even all that important; I'll leave it up to you for whether you want to bother re-rolling to fix it. Either way: Reviewed-by: Elijah Newren <newren@xxxxxxxxx>
