cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch

diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 2a22fa7588d365c11b35cfdcee82dbef3f97ecaf..231b8cc19d6342f54490b0c385150b7cb318494f 100755 (executable)
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -72,12 +72,14 @@ test_expect_success 'noop interactive rebase does not care about ident' '
        git rebase -i HEAD^
 '
 
-test_expect_success 'fast-forward rebase does not care about ident (preserve)' '
+test_expect_success REBASE_P \
+       'fast-forward rebase does not care about ident (preserve)' '
        git checkout -B tmp side-without-commit &&
        git rebase -p master
 '
 
-test_expect_success 'non-fast-forward rebase refuses to write commits (preserve)' '
+test_expect_success REBASE_P \
+       'non-fast-forward rebase refuses to write commits (preserve)' '
        test_when_finished "git rebase --abort || true" &&
        git checkout -B tmp side-with-commit &&
        test_must_fail git rebase -p master