Merge branch 'rs/sort-oid-array-thread-safe'

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 819c24d10eaa3cb4a58b72ae8a8e96151b5cabe9..e88ccb04a9715b92e47976e66753c38c2547babf 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -352,7 +352,7 @@ test_expect_success 'log with grep.patternType configuration and command line' '
        test_cmp expect actual
 '
 
-test_expect_success 'log with various grep.patternType configurations & command-lines' '
+test_expect_success !FAIL_PREREQS 'log with various grep.patternType configurations & command-lines' '
        git init pattern-type &&
        (
                cd pattern-type &&
@@ -1707,4 +1707,11 @@ test_expect_success '--exclude-promisor-objects does not BUG-crash' '
        test_must_fail git log --exclude-promisor-objects source-a
 '
 
+test_expect_success 'log --end-of-options' '
+       git update-ref refs/heads/--source HEAD &&
+       git log --end-of-options --source >actual &&
+       git log >expect &&
+       test_cmp expect actual
+'
+
 test_done