From: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Date: Tue, 02 Jun 2015 16:32:16 GMT
Subject: Re: [PATCH/RFCv3 2/2] git rebase -i: warn about removed commits
Message-ID: <133653833.39653.1433262736640.JavaMail.zimbra@ensimag.grenoble-inp.fr>
In-Reply-To: <vpqzj4ignwe.fsf@anie.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> > Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:
> > +                # Sort the SHA-1 and compare them
> > +                echo "$(sort -u "$todo".oldsha1)" >"$todo".oldsha1
> > +                echo "$(sort -u "$todo".newsha1)" >"$todo".newsha1
> 
> Useless uses of echo.
> 
> echo $(foo) -> foo

In this case it is not true, because of the infile and outfile being
identical. However sort does have a -o (-output) that I missed that
allows avoiding using echo or writing in another file; I'm correcting
with this.

> You should test also that
> 
> git rebase --edit-todo # playing with $EDITOR to restore the original lines.
> git rebase --continue
> 
> actually continues. You did have problems with this in early
> implementations, so it's not straightforward, so it deserves a test.

In this patch, the error is dealt with a die_abort and not die, thus
there is no rebase --edit-todo or rebase --continue possible
afterward.

> You should check the output of git rebase -i too.

Checking that the warning was correctly displayed like in the test for
"warn" if I understood correctly. About that, is checking that the
first line is "Warning: some commits may have been dropped
accidentally." (like in the test for "warn") enough, or should I check
that the commit displayed as removed is the correct one?

The other points have been corrected, or their correction is in
progress.

Thanks,

Rémi