{"thread":{"id":"12403","subject":"[PATCH] t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge","startedAt":"2008-03-01T11:12:13Z","lastAt":"2008-03-01T11:14:14Z","messageCount":2,"participants":["Mike Hommey"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"70512","messageId":"1204369933-3040-1-git-send-email-mh@glandium.org","threadId":"12403","inReplyTo":"mh@glandium.org","subject":"[PATCH] t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2008-03-01T11:12:13Z","receivedAt":"2008-03-01T11:12:13Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"Removing .dotest should actually not be needed, so just test the directory\ndon't exist after --abort, but exists after starting the rebase.\n\nAlso, execute the same tests with rebase --merge, which uses a different code\npath.\n\nSigned-off-by: Mike Hommey <mh@glandium.org>\n---\n t/t3407-rebase-abort.sh |   68 +++++++++++++++++++++++++++-------------------\n 1 files changed, 40 insertions(+), 28 deletions(-)\n\ndiff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh\nindex 3417138..37944c3 100755\n--- a/t/t3407-rebase-abort.sh\n+++ b/t/t3407-rebase-abort.sh\n@@ -23,37 +23,49 @@ test_expect_success setup '\n \tgit branch pre-rebase\n '\n \n-test_expect_success 'rebase --abort' '\n-\ttest_must_fail git rebase master &&\n-\tgit rebase --abort &&\n-\ttest $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)\n-'\n+testrebase() {\n+\ttype=$1\n+\tdotest=$2\n \n-test_expect_success 'rebase --abort after --skip' '\n-\t# Clean up the state from the previous one\n-\tgit reset --hard pre-rebase\n-\trm -rf .dotest\n+\ttest_expect_success \"rebase$type --abort\" '\n+\t\t# Clean up the state from the previous one\n+\t\tgit reset --hard pre-rebase\n+\t\ttest_must_fail git rebase'\"$type\"' master &&\n+\t\ttest -d '$dotest' &&\n+\t\tgit rebase --abort &&\n+\t\ttest $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&\n+\t\ttest ! -d '$dotest'\n+\t'\n \n-\ttest_must_fail git rebase master &&\n-\ttest_must_fail git rebase --skip &&\n-\ttest $(git rev-parse HEAD) = $(git rev-parse master) &&\n-\tgit rebase --abort &&\n-\ttest $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)\n-'\n+\ttest_expect_success \"rebase$type --abort after --skip\" '\n+\t\t# Clean up the state from the previous one\n+\t\tgit reset --hard pre-rebase\n+\t\ttest_must_fail git rebase'\"$type\"' master &&\n+\t\ttest -d '$dotest' &&\n+\t\ttest_must_fail git rebase --skip &&\n+\t\ttest $(git rev-parse HEAD) = $(git rev-parse master) &&\n+\t\tgit-rebase --abort &&\n+\t\ttest $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&\n+\t\ttest ! -d '$dotest'\n+\t'\n \n-test_expect_success 'rebase --abort after --continue' '\n-\t# Clean up the state from the previous one\n-\tgit reset --hard pre-rebase\n-\trm -rf .dotest\n+\ttest_expect_success \"rebase$type --abort after --continue\" '\n+\t\t# Clean up the state from the previous one\n+\t\tgit reset --hard pre-rebase\n+\t\ttest_must_fail git rebase'\"$type\"' master &&\n+\t\ttest -d '$dotest' &&\n+\t\techo c > a &&\n+\t\techo d >> a &&\n+\t\tgit add a &&\n+\t\ttest_must_fail git rebase --continue &&\n+\t\ttest $(git rev-parse HEAD) != $(git rev-parse master) &&\n+\t\tgit rebase --abort &&\n+\t\ttest $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&\n+\t\ttest ! -d '$dotest'\n+\t'\n+}\n \n-\ttest_must_fail git rebase master &&\n-\techo c > a &&\n-\techo d >> a &&\n-\tgit add a &&\n-\ttest_must_fail git rebase --continue &&\n-\ttest $(git rev-parse HEAD) != $(git rev-parse master) &&\n-\tgit rebase --abort &&\n-\ttest $(git rev-parse to-rebase) = $(git rev-parse pre-rebase)\n-'\n+testrebase \"\" .dotest\n+testrebase \" --merge\" .git/.dotest-merge\n \n test_done\n-- \n1.5.4.3.344.g6fd65.dirty\n\n"},{"id":"70513","messageId":"20080301111414.GA3112@glandium.org","threadId":"12403","inReplyTo":"1204369933-3040-1-git-send-email-mh@glandium.org","subject":"Re: [PATCH] t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2008-03-01T11:14:14Z","receivedAt":"2008-03-01T11:14:14Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Sat, Mar 01, 2008 at 12:12:13PM +0100, Mike Hommey wrote:\n> Removing .dotest should actually not be needed, so just test the directory\n> don't exist after --abort, but exists after starting the rebase.\n> \n> Also, execute the same tests with rebase --merge, which uses a different code\n> path.\n> \n> Signed-off-by: Mike Hommey <mh@glandium.org>\n\nShould have been as a reply to\n1204367534-28204-1-git-send-email-mh@glandium.org. Bad copy/paste...\nAnyways, this is against your (Junio's) changes.\n\nMike\n"}]}