diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2020-07-29 23:14:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-30 09:16:49 -0700 |
| commit | c49fe07cffd1ce6d7797f5b5616ecd53dddca744 (patch) | |
| tree | 19012bd9a4a4f8ac35a8cbf03571a49031c62a3d /t/test-lib.sh | |
| parent | 02a32dbff7e13c8cf39339e0fb6b331cab02688a (diff) | |
| download | git-c49fe07cffd1ce6d7797f5b5616ecd53dddca744.tar.gz | |
t: make SHA1 prerequisite depend on default hash
Currently, the SHA1 prerequisite depends on the output of git
hash-object. However, in order for that to produce sane behavior, we
must be in a repository. If we are not, the default will remain SHA-1,
and we'll produce wrong results if we're using SHA-256 for the testsuite
but the test assertion starts when we're not in a repository.
Check the environment variable we use for this purpose, leaving it to
default to SHA-1 if none is specified.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 307bb2207e..0483ed51e1 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1689,7 +1689,11 @@ test_lazy_prereq CURL ' # which will not work with other hash algorithms and tests that work but don't # test anything meaningful (e.g. special values which cause short collisions). test_lazy_prereq SHA1 ' - test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 + case "$GIT_DEFAULT_HASH" in + sha1) true ;; + "") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;; + *) false ;; + esac ' test_lazy_prereq REBASE_P ' |