Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit

2018-07-30 Thread Eric Sunshine
On Mon, Jul 30, 2018 at 11:47 AM Johannes Schindelin wrote: > On Mon, 30 Jul 2018, Eric Sunshine wrote: > > Unfortunately, after sending this series, I see that there is > > additional corruption that needs to be addressed. In particular, the > > "author" header time is incorrectly prefixed with "

Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit

2018-07-30 Thread Eric Sunshine
On Mon, Jul 30, 2018 at 8:14 AM Phillip Wood wrote: > On 30/07/18 10:29, Eric Sunshine wrote: > > It was only after I diagnosed and fixed these bugs that I thought to > > check 'pu' and discovered that Akinori MUSHA already made a stab[1] at > > fixing one of the three bugs which this series fixes

Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit

2018-07-30 Thread Johannes Schindelin
Hi Phillip, On Mon, 30 Jul 2018, Phillip Wood wrote: > On 30/07/18 10:29, Eric Sunshine wrote: > > This series fixes bugs causing corruption of the root commit when > > "rebase -i --root" is used to swap in a new root commit. In particular, > > the "author" header has trailing garbage. Some tools

Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit

2018-07-30 Thread Johannes Schindelin
Hi Eric, On Mon, 30 Jul 2018, Eric Sunshine wrote: > On Mon, Jul 30, 2018 at 5:30 AM Eric Sunshine wrote: > > This series fixes bugs causing corruption of the root commit when > > "rebase -i --root" is used to swap in a new root commit. In particular, > > the "author" header has trailing garbage

Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit

2018-07-30 Thread Junio C Hamano
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. >

Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit

2018-07-30 Thread Phillip Wood
On 30/07/18 10:29, Eric Sunshine wrote: > This series fixes bugs causing corruption of the root commit when > "rebase -i --root" is used to swap in a new root commit. In particular, > the "author" header has trailing garbage. Some tools handle the > corruption somewhat gracefully by showing a bogus

Re: [PATCH 0/2] fix "rebase -i --root" corrupting root commit

2018-07-30 Thread Eric Sunshine
On Mon, Jul 30, 2018 at 5:30 AM Eric Sunshine wrote: > This series fixes bugs causing corruption of the root commit when > "rebase -i --root" is used to swap in a new root commit. In particular, > the "author" header has trailing garbage. Some tools handle the > corruption somewhat gracefully by s