{"thread":{"id":"17189","subject":"[PATCH 2/2] t3404: Add test case for auto-amending only edited commits after \"edit\"","startedAt":"2009-01-15T12:56:15Z","lastAt":"2009-01-15T12:56:16Z","messageCount":2,"participants":["Stephan Beyer"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"100568","messageId":"1232024176-16600-1-git-send-email-s-beyer@gmx.net","threadId":"17189","inReplyTo":null,"subject":"[PATCH 1/2] t3404: Add test case for aborted --continue after \"edit\"","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2009-01-15T12:56:15Z","receivedAt":"2009-01-15T12:56:15Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Add a test case for the bugfix introduced by commit 8beb1f33d\n\"git-rebase-interactive: do not squash commits on abort\".\n\nSigned-off-by: Stephan Beyer <s-beyer@gmx.net>\n---\n t/t3404-rebase-interactive.sh |   15 +++++++++++++++\n 1 files changed, 15 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 7d10a27..1182b46 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -373,6 +373,21 @@ test_expect_success '--continue tries to commit, even for \"edit\"' '\n \ttest $parent = $(git rev-parse HEAD^)\n '\n \n+test_expect_success 'aborted --continue does not squash commits after \"edit\"' '\n+\told=$(git rev-parse HEAD) &&\n+\ttest_tick &&\n+\tFAKE_LINES=\"edit 1\" git rebase -i HEAD^ &&\n+\techo \"edited again\" > file7 &&\n+\tgit add file7 &&\n+\t(\n+\t\tFAKE_COMMIT_MESSAGE=\" \" &&\n+\t\texport FAKE_COMMIT_MESSAGE &&\n+\t\ttest_must_fail git rebase --continue\n+\t) &&\n+\ttest $old = $(git rev-parse HEAD) &&\n+\tgit rebase --abort\n+'\n+\n test_expect_success 'rebase a detached HEAD' '\n \tgrandparent=$(git rev-parse HEAD~2) &&\n \tgit checkout $(git rev-parse HEAD) &&\n-- \n1.6.1.160.gecdb\n"},{"id":"100567","messageId":"1232024176-16600-2-git-send-email-s-beyer@gmx.net","threadId":"17189","inReplyTo":"1232024176-16600-1-git-send-email-s-beyer@gmx.net","subject":"[PATCH 2/2] t3404: Add test case for auto-amending only edited commits after \"edit\"","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2009-01-15T12:56:16Z","receivedAt":"2009-01-15T12:56:16Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Add a test case for the bugfix introduced by commit c14c3c82d\n\"git-rebase--interactive: auto amend only edited commit\".\n\nSigned-off-by: Stephan Beyer <s-beyer@gmx.net>\n---\n t/t3404-rebase-interactive.sh |   17 +++++++++++++++++\n 1 files changed, 17 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 1182b46..2cc8e7a 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -388,6 +388,23 @@ test_expect_success 'aborted --continue does not squash commits after \"edit\"' '\n \tgit rebase --abort\n '\n \n+test_expect_success 'auto-amend only edited commits after \"edit\"' '\n+\ttest_tick &&\n+\tFAKE_LINES=\"edit 1\" git rebase -i HEAD^ &&\n+\techo \"edited again\" > file7 &&\n+\tgit add file7 &&\n+\tFAKE_COMMIT_MESSAGE=\"edited file7 again\" git commit &&\n+\techo \"and again\" > file7 &&\n+\tgit add file7 &&\n+\ttest_tick &&\n+\t(\n+\t\tFAKE_COMMIT_MESSAGE=\"and again\" &&\n+\t\texport FAKE_COMMIT_MESSAGE &&\n+\t\ttest_must_fail git rebase --continue\n+\t) &&\n+\tgit rebase --abort\n+'\n+\n test_expect_success 'rebase a detached HEAD' '\n \tgrandparent=$(git rev-parse HEAD~2) &&\n \tgit checkout $(git rev-parse HEAD) &&\n-- \n1.6.1.160.gecdb\n"}]}