[PATCH 2/2] builtin/hash-object: fix uninitialized hash function
From: Patrick Steinhardt <hidden>
Date: 2024-05-13 07:15:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
The git-hash-object(1) command allows users to hash an object even without a repository. Starting with c8aed5e8da (repository: stop setting SHA1 as the default object hash, 2024-05-07), this will make us hit an uninitialized hash function, which subsequently leads to a segfault. Fix this by falling back to SHA-1 explicitly when running outside of a Git repository. Eventually, we should expose this function as a command line option to the users so that they can pick which object hash to use by themselves. Signed-off-by: Patrick Steinhardt <redacted> --- builtin/hash-object.c | 7 +++++++ t/t1007-hash-object.sh | 6 ++++++ 2 files changed, 13 insertions(+)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 82ca6d2bfd..0855f4f8aa 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c@@ -123,6 +123,13 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix) else prefix = setup_git_directory_gently(&nongit); + /* + * TODO: Allow the hash algorithm to be configured by the user via a + * command line option when not using `-w`. + */ + if (nongit) + repo_set_hash_algo(the_repository, GIT_HASH_SHA1); + if (vpath && prefix) { vpath_free = prefix_filename(prefix, vpath); vpath = vpath_free;
diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
index 64aea38486..4c138c6ca4 100755
--- a/t/t1007-hash-object.sh
+++ b/t/t1007-hash-object.sh@@ -260,4 +260,10 @@ test_expect_success '--literally with extra-long type' ' echo example | git hash-object -t $t --literally --stdin ' +test_expect_success '--stdin outside of repository' ' + nongit git hash-object --stdin <hello >actual && + echo "$(test_oid hello)" >expect && + test_cmp expect actual +' + test_done
--
2.45.GIT
Attachments
- signature.asc [application/pgp-signature] 833 bytes