submodule update: add regression test with old style setups

diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh
index a0f482e2324dfd1f347e252dce284140c66ba622..38e24f787cffb5e645a5b31c8bfa30fb5106bea7 100755 (executable)
--- a/t/t6046-merge-skip-unneeded-updates.sh
+++ b/t/t6046-merge-skip-unneeded-updates.sh
@@ -64,7 +64,7 @@ test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' '
        )
 '
 
-test_expect_failure '1a-check-L: Modify(A)/Modify(B), change on B subset of A' '
+test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' '
        test_when_finished "git -C 1a reset --hard" &&
        test_when_finished "git -C 1a clean -fd" &&
        (
@@ -160,7 +160,7 @@ test_expect_success '2a-setup: Modify(A)/rename(B)' '
        )
 '
 
-test_expect_failure '2a-check-L: Modify/rename, merge into modify side' '
+test_expect_success '2a-check-L: Modify/rename, merge into modify side' '
        test_when_finished "git -C 2a reset --hard" &&
        test_when_finished "git -C 2a clean -fd" &&
        (
@@ -360,13 +360,15 @@ test_expect_success '2c-setup: Modify b & add c VS rename b->c' '
        )
 '
 
-test_expect_failure '2c-check: Modify b & add c VS rename b->c' '
+test_expect_success '2c-check: Modify b & add c VS rename b->c' '
        (
                cd 2c &&
 
                git checkout A^0 &&
 
-               GIT_MERGE_VERBOSITY=3 test_must_fail git merge -s recursive B^0 >out 2>err &&
+               GIT_MERGE_VERBOSITY=3 &&
+               export GIT_MERGE_VERBOSITY &&
+               test_must_fail git merge -s recursive B^0 >out 2>err &&
 
                test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
                test_i18ngrep ! "Skipped c" out &&
@@ -456,7 +458,7 @@ test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
        )
 '
 
-test_expect_failure '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
        test_when_finished "git -C 3a reset --hard" &&
        test_when_finished "git -C 3a clean -fd" &&
        (
@@ -579,7 +581,7 @@ test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
        )
 '
 
-test_expect_failure '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
        test_when_finished "git -C 3b reset --hard" &&
        test_when_finished "git -C 3b clean -fd" &&
        (