Merge branch 'rs/preserve-merges-unused-code-removal'

[thirdparty/git.git] / t / t5324-split-commit-graph.sh

diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 269d0964a3e0b51bceffe0362f45f5c0a8bd229c..ea28d522b8375678c9a54d6c4b6717ef8f11ab6f 100755 (executable)
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -12,7 +12,6 @@ test_expect_success 'setup repo' '
        git config gc.writeCommitGraph false &&
        infodir=".git/objects/info" &&
        graphdir="$infodir/commit-graphs" &&
-       test_oid_init &&
        test_oid_cache <<-EOM
        shallow sha1:1760
        shallow sha256:2064
@@ -399,7 +398,7 @@ test_expect_success ULIMIT_FILE_DESCRIPTORS 'handles file descriptor exhaustion'
                for i in $(test_seq 64)
                do
                        test_commit $i &&
-                       test_might_fail run_with_limited_open_files git commit-graph write \
+                       run_with_limited_open_files test_might_fail git commit-graph write \
                                --split=no-merge --reachable || return 1
                done
        )