On Thu, Aug 09, 2012 at 08:39:51AM -0700, Martin von Zweigbergk wrote: > Add test cases for 'git rebase --keep-empty' with and without an > "empty" commit already in upstream. The empty commit that is about to > be rebased should be kept in both cases. > > Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx> > --- > > Added another test for when the upstream already has an empty > commit. The test case protects the current behavior; I just assume the > current behavior is what we want. > > While writing the test case, I also noticed that an interrupted 'git > rebase --keep-empty' can not be continued 'git rebase --continue', but > instead needs 'git cherry-pick --continue'. I guess this shouldn't > really be surprising given that it's implemented in terms of > cherry-pick. This should be fixed once all the different kinds of > rebase use the same way of finding the commits to rebase, so I > wouldn't worry about fixing this specific problem right now. > > t/t3401-rebase-partial.sh | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh > index 7f8693b..58f4823 100755 > --- a/t/t3401-rebase-partial.sh > +++ b/t/t3401-rebase-partial.sh > @@ -47,7 +47,23 @@ test_expect_success 'rebase ignores empty commit' ' > git commit --allow-empty -m empty && > test_commit D && > git rebase C && > - test $(git log --format=%s C..) = "D" > + test "$(git log --format=%s C..)" = "D" > +' > + > +test_expect_success 'rebase --keep-empty' ' > + git reset --hard D && > + git rebase --keep-empty C && > + test "$(git log --format=%s C..)" = "D > +empty" > +' > + > +test_expect_success 'rebase --keep-empty keeps empty even if already in upstream' ' > + git reset --hard A && > + git commit --allow-empty -m also-empty && > + git rebase --keep-empty D && > + test "$(git log --format=%s A..)" = "also-empty > +D > +empty" > ' > > test_done > -- > 1.7.11.1.104.ge7b44f1 > > -- 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