On Wed, May 29, 2013 at 12:38 AM, Martin von Zweigbergk <martinvonz@xxxxxxxxx> wrote: > Actually, are all of 2/8 - 7/8 fixes for things that broke in patch 1/8? No, everything is already broken. Try this: --- a/git-rebase.sh +++ b/git-rebase.sh @@ -78,7 +78,7 @@ state_dir= action= preserve_merges= autosquash= -keep_empty= +keep_empty=yes test "$(git config --bool rebase.autosquash)" = "true" && autosquash=t read_basic_state () { And tell me what happens when you run the test suite: Hint: This[1] is what would happen; everything breaks, not only the tests that check for empty commits. [1] http://article.gmane.org/gmane.comp.version-control.git/225652 -- Felipe Contreras -- 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