merge(3p/git): Merge git subtree at v2.29.2
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
This commit is contained in:
Vincent Ambo
parent
082c006c04
commit
f4609b896f
1485 changed files with 241535 additions and 109418 deletions
84
third_party/git/t/README
vendored
84
third_party/git/t/README
vendored
|
|
@ -1,7 +1,7 @@
|
|||
Core GIT Tests
|
||||
Core Git Tests
|
||||
==============
|
||||
|
||||
This directory holds many test scripts for core GIT tools. The
|
||||
This directory holds many test scripts for core Git tools. The
|
||||
first part of this short document describes how to run the tests
|
||||
and read their output.
|
||||
|
||||
|
|
@ -69,7 +69,8 @@ You can also run each test individually from command line, like this:
|
|||
|
||||
You can pass --verbose (or -v), --debug (or -d), and --immediate
|
||||
(or -i) command line argument to the test, or by setting GIT_TEST_OPTS
|
||||
appropriately before running "make".
|
||||
appropriately before running "make". Short options can be bundled, i.e.
|
||||
'-d -v' is the same as '-dv'.
|
||||
|
||||
-v::
|
||||
--verbose::
|
||||
|
|
@ -352,8 +353,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, overrides the
|
||||
'protocol.version' setting to n if it is less than n.
|
||||
GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version'
|
||||
default to n.
|
||||
|
||||
GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon
|
||||
pack-objects code path where there are more than 1024 packs even if
|
||||
|
|
@ -378,6 +379,11 @@ GIT_TEST_COMMIT_GRAPH=<boolean>, when true, forces the commit-graph to
|
|||
be written after every 'git commit' command, and overrides the
|
||||
'core.commitGraph' setting to true.
|
||||
|
||||
GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=<boolean>, when true, forces
|
||||
commit-graph write to compute and write changed path Bloom filters for
|
||||
every 'git commit-graph write', as if the `--changed-paths` option was
|
||||
passed in.
|
||||
|
||||
GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all exercises the fsmonitor
|
||||
code path for utilizing a file system monitor to speed up detecting
|
||||
new or changed files.
|
||||
|
|
@ -386,15 +392,15 @@ GIT_TEST_INDEX_VERSION=<n> exercises the index read/write code path
|
|||
for the index version specified. Can be set to any valid version
|
||||
(currently 2, 3, or 4).
|
||||
|
||||
GIT_TEST_PACK_SPARSE=<boolean> if enabled will default the pack-objects
|
||||
builtin to use the sparse object walk. This can still be overridden by
|
||||
the --no-sparse command-line argument.
|
||||
GIT_TEST_PACK_SPARSE=<boolean> if disabled will default the pack-objects
|
||||
builtin to use the non-sparse object walk. This can still be overridden by
|
||||
the --sparse command-line argument.
|
||||
|
||||
GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
|
||||
by overriding the minimum number of cache entries required per thread.
|
||||
|
||||
GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the
|
||||
built-in version of git-stash. See 'stash.useBuiltin' in
|
||||
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
|
||||
|
|
@ -415,6 +421,10 @@ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=<boolean>, when true (which is
|
|||
the default when running tests), errors out when an abbreviated option
|
||||
is used.
|
||||
|
||||
GIT_TEST_DEFAULT_HASH=<hash-algo> specifies which hash algorithm to
|
||||
use in the test scripts. Recognized values for <hash-algo> are "sha1"
|
||||
and "sha256".
|
||||
|
||||
Naming Tests
|
||||
------------
|
||||
|
||||
|
|
@ -546,6 +556,41 @@ Here are the "do's:"
|
|||
reports "ok" or "not ok" to the end user running the tests. Under
|
||||
--verbose, they are shown to help debug the tests.
|
||||
|
||||
- Be careful when you loop
|
||||
|
||||
You may need to verify multiple things in a loop, but the
|
||||
following does not work correctly:
|
||||
|
||||
test_expect_success 'test three things' '
|
||||
for i in one two three
|
||||
do
|
||||
test_something "$i"
|
||||
done &&
|
||||
test_something_else
|
||||
'
|
||||
|
||||
Because the status of the loop itself is the exit status of the
|
||||
test_something in the last round, the loop does not fail when
|
||||
"test_something" for "one" or "two" fails. This is not what you
|
||||
want.
|
||||
|
||||
Instead, you can break out of the loop immediately when you see a
|
||||
failure. Because all test_expect_* snippets are executed inside
|
||||
a function, "return 1" can be used to fail the test immediately
|
||||
upon a failure:
|
||||
|
||||
test_expect_success 'test three things' '
|
||||
for i in one two three
|
||||
do
|
||||
test_something "$i" || return 1
|
||||
done &&
|
||||
test_something_else
|
||||
'
|
||||
|
||||
Note that we still &&-chain the loop to propagate failures from
|
||||
earlier commands.
|
||||
|
||||
|
||||
And here are the "don'ts:"
|
||||
|
||||
- Don't exit() within a <script> part.
|
||||
|
|
@ -978,6 +1023,15 @@ 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
|
||||
-------------
|
||||
|
|
@ -1067,21 +1121,21 @@ Tips for Writing Tests
|
|||
As with any programming projects, existing programs are the best
|
||||
source of the information. However, do _not_ emulate
|
||||
t0000-basic.sh when writing your tests. The test is special in
|
||||
that it tries to validate the very core of GIT. For example, it
|
||||
that it tries to validate the very core of Git. For example, it
|
||||
knows that there will be 256 subdirectories under .git/objects/,
|
||||
and it knows that the object ID of an empty tree is a certain
|
||||
40-byte string. This is deliberately done so in t0000-basic.sh
|
||||
because the things the very basic core test tries to achieve is
|
||||
to serve as a basis for people who are changing the GIT internal
|
||||
to serve as a basis for people who are changing the Git internals
|
||||
drastically. For these people, after making certain changes,
|
||||
not seeing failures from the basic test _is_ a failure. And
|
||||
such drastic changes to the core GIT that even changes these
|
||||
such drastic changes to the core Git that even changes these
|
||||
otherwise supposedly stable object IDs should be accompanied by
|
||||
an update to t0000-basic.sh.
|
||||
|
||||
However, other tests that simply rely on basic parts of the core
|
||||
GIT working properly should not have that level of intimate
|
||||
knowledge of the core GIT internals. If all the test scripts
|
||||
Git working properly should not have that level of intimate
|
||||
knowledge of the core Git internals. If all the test scripts
|
||||
hardcoded the object IDs like t0000-basic.sh does, that defeats
|
||||
the purpose of t0000-basic.sh, which is to isolate that level of
|
||||
validation in one place. Your test also ends up needing
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue