| Message ID | 1e010f798ce50e51100bd46564a69ddbd31d29ea.1715582857.git.ps@pks.im (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Fix use of uninitialized hash algos | expand |
Patrick Steinhardt <ps@pks.im> writes: > 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); This breaks t1007 when linux-sha256) export GIT_TEST_DEFAULT_HASH=sha256 is in effect.
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
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 <ps@pks.im> --- builtin/hash-object.c | 7 +++++++ t/t1007-hash-object.sh | 6 ++++++ 2 files changed, 13 insertions(+)