Merge branch 'nd/worktree-name-sanitization'

diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index bb78a6ec86d3a86f7c1e872981b7952f2293274b..a5868ea152f94108418175a4c8af583462c09fce 100755 (executable)
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -65,12 +65,13 @@ test_rebase_am_only --ignore-whitespace
 test_rebase_am_only --committer-date-is-author-date
 test_rebase_am_only -C4
 
-test_expect_success '--preserve-merges incompatible with --signoff' '
+test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
        git checkout B^0 &&
        test_must_fail git rebase --preserve-merges --signoff A
 '
 
-test_expect_success '--preserve-merges incompatible with --rebase-merges' '
+test_expect_success REBASE_P \
+       '--preserve-merges incompatible with --rebase-merges' '
        git checkout B^0 &&
        test_must_fail git rebase --preserve-merges --rebase-merges A
 '