tests: mark a couple more test cases as requiring `rebase -p`
The `--preserve-merges` option has been deprecated, and as a consequence we started to mark test cases that require that option to be supported, in preparation for removing that support eventually. Since we marked those test cases, a couple more crept into the test suite, and with this patch, we mark them, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
May 28, 2019 at 05:42 UTC
db4a3f26c373fd73688991fbeb76b2d00b9a470c
2 files changed
+13
-7
t/t3422-rebase-incompatible-options.sh
+3
-2
@@ -65,12 +65,13 @@ test_rebase_am_only --ignore-whitespace
65
test_rebase_am_only --committer-date-is-author-date
66
test_rebase_am_only -C4
67
68
-test_expect_success '--preserve-merges incompatible with --signoff' '
68
+test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
69
git checkout B^0 &&
70
test_must_fail git rebase --preserve-merges --signoff A
71
'
72
73
-test_expect_success '--preserve-merges incompatible with --rebase-merges' '
73
+test_expect_success REBASE_P \
74
+ '--preserve-merges incompatible with --rebase-merges' '
75
git checkout B^0 &&
76
test_must_fail git rebase --preserve-merges --rebase-merges A
77
'
t/t3427-rebase-subtree.sh
+10
-5
@@ -38,7 +38,8 @@ test_expect_success 'setup' '
38
'
39
40
# FAILURE: Does not preserve master4.
41
-test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' '
41
+test_expect_failure REBASE_P \
42
+ 'Rebase -Xsubtree --preserve-merges --onto commit 4' '
43
reset_rebase &&
44
git checkout -b rebase-preserve-merges-4 master &&
45
git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
@@ -48,7 +49,8 @@ test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 4' '
49
'
50
51
# FAILURE: Does not preserve master5.
51
-test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 5' '
52
+test_expect_failure REBASE_P \
53
+ 'Rebase -Xsubtree --preserve-merges --onto commit 5' '
54
reset_rebase &&
55
git checkout -b rebase-preserve-merges-5 master &&
56
git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
@@ -58,7 +60,8 @@ test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit 5' '
60
'
61
62
# FAILURE: Does not preserve master4.
61
-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '
63
+test_expect_failure REBASE_P \
64
+ 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' '
65
reset_rebase &&
66
git checkout -b rebase-keep-empty-4 master &&
67
git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
@@ -68,7 +71,8 @@ test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto comm
71
'
72
73
# FAILURE: Does not preserve master5.
71
-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '
74
+test_expect_failure REBASE_P \
75
+ 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' '
76
reset_rebase &&
77
git checkout -b rebase-keep-empty-5 master &&
78
git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&
@@ -78,7 +82,8 @@ test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto comm
82
'
83
84
# FAILURE: Does not preserve Empty.
81
-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '
85
+test_expect_failure REBASE_P \
86
+ 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' '
87
reset_rebase &&
88
git checkout -b rebase-keep-empty-empty master &&
89
git filter-branch --prune-empty -f --subdirectory-filter files_subtree &&