Re: [PATCH] t3404: check root commit in 'rebase -i --root reword root commit'

2018-06-20 Thread Johannes Schindelin
Hi Junio, On Tue, 19 Jun 2018, Junio C Hamano wrote: > Todd Zullinger writes: > > > index e500d7c320..352a52e59d 100755 > > --- a/t/t3404-rebase-interactive.sh > > +++ b/t/t3404-rebase-interactive.sh > > @@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root > > commit' ' > >

Re: [PATCH] t3404: check root commit in 'rebase -i --root reword root commit'

2018-06-20 Thread Johannes Schindelin
Hi Junio, On Tue, 19 Jun 2018, Junio C Hamano wrote: > Todd Zullinger writes: > > > With luck, this will save you a few minutes, assuming the > > commit message is reasonable (or can be improved with help > > from Phillip and others). :) > > OK. > > > Or Junio may just squash this onto

Re: [PATCH] t3404: check root commit in 'rebase -i --root reword root commit'

2018-06-19 Thread Todd Zullinger
Junio C Hamano wrote: > Todd Zullinger writes: >> Or Junio may just squash this onto js/rebase-i-root-fix. > > Nah, not for a hotfix on the last couple of days before the final. > We'd need to build on top, not "squash". Indeed. I somehow missed that you'd merged and pushed the changes to

Re: [PATCH] t3404: check root commit in 'rebase -i --root reword root commit'

2018-06-19 Thread Junio C Hamano
Todd Zullinger writes: > index e500d7c320..352a52e59d 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root commit' > ' > set_fake_editor && > FAKE_LINES="reword 1 2"

Re: [PATCH] t3404: check root commit in 'rebase -i --root reword root commit'

2018-06-19 Thread Junio C Hamano
Todd Zullinger writes: > With luck, this will save you a few minutes, assuming the > commit message is reasonable (or can be improved with help > from Phillip and others). :) OK. > Or Junio may just squash this onto js/rebase-i-root-fix. Nah, not for a hotfix on the last couple of days before

Re: [PATCH] t3404: check root commit in 'rebase -i --root reword root commit'

2018-06-19 Thread Johannes Schindelin
Hi Todd, On Mon, 18 Jun 2018, Todd Zullinger wrote: > When testing a reworded root commit, ensure that the squash-onto commit > which is created and amended is still the root commit. > > Suggested-by: Phillip Wood > Helped-by: Johannes Schindelin > Signed-off-by: Todd Zullinger Trusting