global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

t: default to compile-time default hash if not set

Browse Source 
Right now, the default compile-time hash is SHA-1.  However, in the
future, this might change and it would be helpful to gracefully handle
this case in our testsuite.

To avoid making these assumptions, let's introduce a variable that
contains the built-in default hash and use it in our setup code as the
fallback value if no hash was explicitly set.  For now, this is always
SHA-1, but in a future commit, we'll allow adjusting this and the
variable will be more useful.

To allow us to make our tests more robust, allow test_oid to take the
--hash=builtin option to specify this hash, whatever it is.

Additionally, add a DEFAULT_HASH_ALGORITHM prerequisite to check for the
compile-time hash.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2025-07-01 21:22:32 +00:00
committed by Junio C Hamano
parent d6e616cee7
commit c470ac4ac4
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
t/test-lib-functions.sh
View File

@@ -1695,7 +1695,7 @@ test_set_hash () {
# Detect the hash algorithm in use. # Detect the hash algorithm in use.
test_detect_hash () { test_detect_hash () {
case "$GIT_TEST_DEFAULT_HASH" in case "${GIT_TEST_DEFAULT_HASH:-$GIT_TEST_BUILTIN_HASH}" in
"sha256") "sha256")
test_hash_algo=sha256 test_hash_algo=sha256
test_compat_hash_algo=sha1 test_compat_hash_algo=sha1
@@ -1767,6 +1767,9 @@ test_oid () {
--hash=compat) --hash=compat)
algo="$test_compat_hash_algo" && algo="$test_compat_hash_algo" &&
shift;; shift;;
--hash=builtin)
algo="$GIT_TEST_BUILTIN_HASH" &&
shift;;
--hash=*) --hash=*)
algo="${1#--hash=}" && algo="${1#--hash=}" &&
shift;; shift;;

7
t/test-lib.sh
View File

@@ -536,7 +536,8 @@ export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
export EDITOR export EDITOR
GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-sha1}" GIT_TEST_BUILTIN_HASH=sha1
GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-$GIT_TEST_BUILTIN_HASH}"
export GIT_DEFAULT_HASH export GIT_DEFAULT_HASH
GIT_DEFAULT_REF_FORMAT="${GIT_TEST_DEFAULT_REF_FORMAT:-files}" GIT_DEFAULT_REF_FORMAT="${GIT_TEST_DEFAULT_REF_FORMAT:-files}"
export GIT_DEFAULT_REF_FORMAT export GIT_DEFAULT_REF_FORMAT
@@ -1895,6 +1896,10 @@ test_lazy_prereq SHA1 '
esac esac
' '
test_lazy_prereq DEFAULT_HASH_ALGORITHM '
test "$GIT_TEST_BUILTIN_HASH" = "$GIT_DEFAULT_HASH"
'
test_lazy_prereq DEFAULT_REPO_FORMAT ' test_lazy_prereq DEFAULT_REPO_FORMAT '
test_have_prereq SHA1,REFFILES test_have_prereq SHA1,REFFILES
' '