On Wed, Apr 23, 2014 at 10:44 PM, Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> > --- > diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh > index e6a6481..274b2cc 100755 > --- a/t/t3504-cherry-pick-rerere.sh > +++ b/t/t3504-cherry-pick-rerere.sh > @@ -42,4 +42,43 @@ test_expect_success 'cherry-pick conflict without rerere' ' > test_must_fail test_cmp expect foo > ' > > +test_expect_success 'cherry-pick --rerere-autoupdate' ' > + test_when_finished "rm -rf rerere" && > + ( > + git init rerere && > + cd rerere && > + test_config rerere.enabled true && > + echo one > content-a && git add content-a && > + echo one > content-b && git add content-b && > + git commit -m one && > + git checkout -b conflict master && > + echo conflict-a > content-a && > + git commit -a -m conflict-a && > + echo conflict-b > content-b && > + git commit -a -m conflict-b && > + git checkout master && > + echo two > content-a && > + echo two > content-b && > + git commit -a -m two && > + git checkout -b test && > + test_must_fail git cherry-pick master..conflict && > + echo resolved-a > content-a && > + git add content-a && > + test_must_fail git cherry-pick --continue && > + echo resolved-b > content-b && > + git add content-b && > + git cherry-pick --continue && > + git reset --hard master Broken &&-chain. > + git log --oneline --all --decorate --graph && > + test_must_fail git cherry-pick --rerere-autoupdate master..conflict && > + git log --oneline --all --decorate --graph && > + echo resolved-a > expected && > + test_cmp expected content-a Ditto. > + test_must_fail git cherry-pick --continue && > + echo resolved-b > expected && > + test_cmp expected content-b && > + git cherry-pick --continue > + ) > +' > + > test_done > -- > 1.9.2+fc1.2.gfbaae8c -- 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