Hi Junio, On Tue, 19 Jun 2018, Junio C Hamano wrote: > Todd Zullinger <tmz@xxxxxxxxx> 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" FAKE_COMMIT_MESSAGE="A changed" \ > > git rebase -i --root && > > - git show HEAD^ | grep "A changed" > > + git show HEAD^ | grep "A changed" && > > + test -z "$(git show -s --format=%p HEAD^)" > > ' > > The additional test probably will pass when HEAD is a root commit by > failing to refer to HEAD^, resulting an empty output from show. The > previous step would also give an error and won't emit anything that > would match "A changed", so it probably is OK, though. That matches my thinking. Otherwise, we would have had to do the git show -s --format=%p HEAD^ >out && test_must_be_empty out dance. Ciao, Dscho
