From: Jeff King Date: Thu, 12 May 2011 11:10:07 GMT Subject: [PATCH 3/3] t3503: test cherry picking and reverting root commits Message-ID: <20110512111007.GC5292@sigill.intra.peff.net> In-Reply-To: <20110512110855.GA5240@sigill.intra.peff.net> We already tested cherry-picking a root commit, but only with the internal merge-recursive strategy. Let's also test the recently-allowed reverting of a root commit, as well as testing with external strategies (which until recently triggered a segfault). Signed-off-by: Jeff King --- t/t3503-cherry-pick-root.sh | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh index b0faa29..1f9ed67 100755 --- a/t/t3503-cherry-pick-root.sh +++ b/t/t3503-cherry-pick-root.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='test cherry-picking a root commit' +test_description='test cherry-picking (and reverting) a root commit' . ./test-lib.sh @@ -27,4 +27,25 @@ test_expect_success 'cherry-pick a root commit' ' ' +test_expect_success 'revert a root commit' ' + + git revert master && + ! test -f file1 + +' + +test_expect_success 'cherry-pick a root commit with an external strategy' ' + + git cherry-pick --strategy=resolve master && + test first = $(cat file1) + +' + +test_expect_success 'revert a root commit with an external strategy' ' + + git revert --strategy=resolve master && + ! test -f file1 + +' + test_done -- 1.7.5.1.12.ga7abed