t3427: condense the unnecessarily repetitive test cases into three

diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 64ba95f3e0dda0fc72fceac07627a769f0335828..b21925d279aaad3f59cb61c97da959876d36e596 100755 (executable)
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -64,70 +64,31 @@ test_expect_success 'setup' '
 '
 
 # FAILURE: Does not preserve master4.
-test_expect_failure REBASE_P \
-       'Rebase -Xsubtree --preserve-merges --onto commit 4' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
        reset_rebase &&
-       git checkout -b rebase-preserve-merges-4 to-rebase &&
-       git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
-       verbose test "$(commit_message HEAD~)" = "files_subtree/master4"
-'
-
-# FAILURE: Does not preserve master5.
-test_expect_failure REBASE_P \
-       'Rebase -Xsubtree --preserve-merges --onto commit 5' '
-       reset_rebase &&
-       git checkout -b rebase-preserve-merges-5 to-rebase &&
+       git checkout -b rebase-preserve-merges to-rebase &&
        git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
+       verbose test "$(commit_message HEAD~)" = "files_subtree/master4" &&
        verbose test "$(commit_message HEAD)" = "files_subtree/master5"
 '
 
 # FAILURE: Does not preserve master4.
-test_expect_failure REBASE_P \
-       'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
        reset_rebase &&
-       git checkout -b rebase-keep-empty-4 to-rebase &&
-       git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
-       verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
-'
-
-# FAILURE: Does not preserve master5.
-test_expect_failure REBASE_P \
-       'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '
-       reset_rebase &&
-       git checkout -b rebase-keep-empty-5 to-rebase &&
-       git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
-       verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-
-# FAILURE: Does not preserve Empty.
-test_expect_failure REBASE_P \
-       'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '
-       reset_rebase &&
-       git checkout -b rebase-keep-empty-empty to-rebase &&
+       git checkout -b rebase-keep-empty to-rebase &&
        git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
+       verbose test "$(commit_message HEAD~2)" = "files_subtree/master4" &&
+       verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
        verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
 # FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 4' '
-       reset_rebase &&
-       git checkout -b rebase-onto-4 to-rebase &&
-       git rebase -Xsubtree=files_subtree --onto files-master master &&
-       verbose test "$(commit_message HEAD~2)" = "files_subtree/master4"
-'
-
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto commit 5' '
-       reset_rebase &&
-       git checkout -b rebase-onto-5 to-rebase &&
-       git rebase -Xsubtree=files_subtree --onto files-master master &&
-       verbose test "$(commit_message HEAD~)" = "files_subtree/master5"
-'
-# FAILURE: fatal: Could not parse object
-test_expect_failure 'Rebase -Xsubtree --onto empty commit' '
+test_expect_failure 'Rebase -Xsubtree --onto commit' '
        reset_rebase &&
-       git checkout -b rebase-onto-empty to-rebase &&
+       git checkout -b rebase-onto to-rebase &&
        git rebase -Xsubtree=files_subtree --onto files-master master &&
+       verbose test "$(commit_message HEAD~2)" = "files_subtree/master4" &&
+       verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
        verbose test "$(commit_message HEAD)" = "Empty commit"
 '