From: Junio C Hamano Date: Mon, 30 Jul 2018 15:29:05 GMT Subject: Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit Message-ID: In-Reply-To: <1f172fc1-4b51-cdf7-e841-5ca41e209be4@talktalk.net> Phillip Wood writes: >> Moreover, patch 2/2 of this series provides a more thorough fix overall >> than Akinori, so it may make sense to replace his patch with this >> series, though perhaps keep the test his patch adds to augment the >> strict test of the "author" header added by this series. > > Johannes and I have some fixups for Akinori's patch on the branch > fix-t3403-author-script-test at https://github.com/phillipwood/git > > That branch also contains a fix for the bad quoting of names with "'" in > them. I think it would be good to somehow try and combine this series > with those patches. Thanks for working well together. Always nice to see contributors thinking beyond immediate band-aid and for longer term ;-) > I'd really like to see a single function to read and another to write > the author script that is shared by 'git am' and 'git rebase -i', rather > than the two writers and three readers we have at the moment. I was > thinking of doing that in the longer term, but given the extra bug > you've found in read_author_script() maybe we should do that sooner > rather than later.