builtin/hash-object: fix uninitialized hash function
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. Users can use GIT_DEFAULT_HASH environment to specify what hash algorithm they want, so arguably this code should not be needed. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
May 20, 2024 at 16:14 UTC
8d058b8024ff57b2c6653a0667b01cfedb1bce44
3 files changed
+10
-1
builtin/hash-object.c
+3
@@ -123,6 +123,9 @@ int cmd_hash_object(int argc, const char **argv, const char *prefix)
123
else
124
prefix = setup_git_directory_gently(&nongit);
125
126
+ if (nongit && !the_hash_algo)
127
+ repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
128
+
129
if (vpath && prefix) {
130
vpath_free = prefix_filename(prefix, vpath);
131
vpath = vpath_free;
t/t1007-hash-object.sh
+6
@@ -260,4 +260,10 @@ test_expect_success '--literally with extra-long type' '
260
echo example | git hash-object -t $t --literally --stdin
261
'
262
263
+test_expect_success '--stdin outside of repository (uses SHA-1)' '
264
+ nongit git hash-object --stdin <hello >actual &&
265
+ echo "$(test_oid --hash=sha1 hello)" >expect &&
266
+ test_cmp expect actual
267
+'
268
+
269
test_done
t/t1517-outside-repo.sh
+1
-1
@@ -29,7 +29,7 @@ test_expect_success 'compute a patch-id outside repository (uses SHA-1)' '
29
test_cmp patch-id.expect patch-id.actual
30
'
31
32
-test_expect_failure 'hash-object outside repository (uses SHA-1)' '
32
+test_expect_success 'hash-object outside repository (uses SHA-1)' '
33
nongit env GIT_DEFAULT_HASH=sha1 \
34
git hash-object --stdin <sample.patch >hash.expect &&
35
nongit \