about summary refs log tree commit diff
path: root/third_party/git/t/README
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/README
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/README')
-rw-r--r--third_party/git/t/README17
1 files changed, 2 insertions, 15 deletions
diff --git a/third_party/git/t/README b/third_party/git/t/README
index 9afd61e3ca0d..60d5b77bccd9 100644
--- a/third_party/git/t/README
+++ b/third_party/git/t/README
@@ -352,8 +352,8 @@ details.
 GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole
 test suite. Accept any boolean values that are accepted by git-config.
 
-GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version'
-default to n.
+GIT_TEST_PROTOCOL_VERSION=<n>, when set, overrides the
+'protocol.version' setting to n if it is less than n.
 
 GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon
 pack-objects code path where there are more than 1024 packs even if
@@ -397,10 +397,6 @@ GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the
 built-in version of git-stash. See 'stash.useBuiltin' in
 git-config(1).
 
-GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
-built-in version of git add -i. See 'add.interactive.useBuiltin' in
-git-config(1).
-
 GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading
 of the index for the whole test suite by bypassing the default number of
 cache entries and thread minimums. Setting this to 1 will make the
@@ -982,15 +978,6 @@ library for your script to use.
    output to the downstream---unlike the real version, it generates
    only up to 99 lines.
 
- - test_bool_env <env-variable-name> <default-value>
-
-   Given the name of an environment variable with a bool value,
-   normalize its value to a 0 (true) or 1 (false or empty string)
-   return code.  Return with code corresponding to the given default
-   value if the variable is unset.
-   Abort the test script if either the value of the variable or the
-   default are not valid bool values.
-
 
 Prerequisites
 -------------