Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > > Galan Rémi <remi.galan-alfonso@xxxxxxxxxxxxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html