Merge branch 'js/rebase-i-dedup-call-to-rerere'

diff --git a/t/t1515-rev-parse-outside-repo.sh b/t/t1515-rev-parse-outside-repo.sh
index ae330931b78ff30caa85dbe77d5d61d097d60b69..3ec2971ee5befd2ad8ffff5e099f05307746e6d1 100755 (executable)
--- a/t/t1515-rev-parse-outside-repo.sh
+++ b/t/t1515-rev-parse-outside-repo.sh
@@ -27,14 +27,14 @@ test_expect_success 'rev-parse --sq-quote' '
        test_cmp expect actual
 '
 
-test_expect_failure 'rev-parse --local-env-vars' '
+test_expect_success 'rev-parse --local-env-vars' '
        git rev-parse --local-env-vars >actual &&
        # we do not want to depend on the complete list here,
        # so just look for something plausible
        grep ^GIT_DIR actual
 '
 
-test_expect_failure 'rev-parse --resolve-git-dir' '
+test_expect_success 'rev-parse --resolve-git-dir' '
        git init --separate-git-dir repo dir &&
        test_must_fail git rev-parse --resolve-git-dir . &&
        echo "$(pwd)/repo" >expect &&