test-dir-iterator: do not assume errno values

diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh
index fcefffcaece290f4070aceb9ddf6b5579447f104..3a47623ed3160b9037cbf7fd63bf7638a8dd57dc 100755 (executable)
--- a/t/t6046-merge-skip-unneeded-updates.sh
+++ b/t/t6046-merge-skip-unneeded-updates.sh
@@ -366,7 +366,9 @@ test_expect_success '2c-check: Modify b & add c VS rename b->c' '
 
                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 &&
@@ -464,7 +466,7 @@ test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout A^0 &&
 
-               GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+               GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
                test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&
@@ -493,7 +495,7 @@ test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout B^0 &&
 
-               GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+               GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
                test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&
@@ -558,7 +560,7 @@ test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout A^0 &&
 
-               GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+               GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
                test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&
@@ -587,7 +589,7 @@ test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout B^0 &&
 
-               GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+               GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
                test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&