Hi Eric On 31/07/18 11:46, Eric Sunshine wrote: > On Tue, Jul 31, 2018 at 6:06 AM Phillip Wood <phillip.wood@xxxxxxxxxxxx> wrote: >> On 31/07/18 08:33, Eric Sunshine wrote: >>> Patch 2/4 of this series conflicts with Akinori MUSHA's >>> 'am/sequencer-author-script-fix' which takes a stab at fixing one of the >>> four (or so) bugs fixed by this series (namely, adding a missing closing >>> quote to GIT_AUTHOR_DATE in "rebase-merge/author-script"). That patch >>> probably ought to be dropped (without prejudice) in favor of this series >>> for the following reasons: >>> [...] >>> The test added by Akinori MUSHA's patch may still have value, and it may >>> make sense to re-submit it, however, doing so need not hold up this >>> (higher priority) series. >> >> Yes I think it does, also the patch that Johannes and I have on top of >> it to fix the quoting of "'" in write_author_script() relies on fixing >> the missing trailing quote and handling of "'" at the same time, >> hopefully we can get that rebased on top of these asap. > > I'm not sure if "Yes I think it does" means that Akinori's test has > value or if it means that this series should be held back waiting for > other changes built atop it. It means we should use a test based on that with the quoting fixes on top of this series and progress them together if possible. I think the quoting patch I just sent is good now so hopefully there wont be any issue with it holding up your fixes. > Anyhow, thanks for reading over the series. I appreciate it even if > our "sense of priority" doesn't always align (as evidenced by your > review comments and my responses). My "sense of priority" was informed by the hope that the quoting patch wouldn't hold things up (let's hope I was right about that!). Best Wishes Phillip
