kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

show-index: fix uninitialized hash function 

In c8aed5e8da (repository: stop setting SHA1 as the default object
hash), we got rid of the default hash algorithm for the_repository.
Due to this change, it is now the responsibility of the callers to set
their own default when this is not present.

As stated in the docs, show-index should use SHA1 as the default hash
algorithm when run outside a repository. Make sure this promise is
met by falling back to SHA1 when the_hash_algo is not present (i.e.
when the command is run outside a repository). Also add a test that
verifies this behavior.

Signed-off-by: Abhijeet Sonar <abhijeet.nkt@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Abhijeet Sonar 2024-11-09 14:57:38 +05:30 committed by Junio C Hamano
parent 6a11438f43
commit 4da8d90fdd
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/show-index.c
View File

@ -38,6 +38,15 @@ int cmd_show_index(int argc,
repo_set_hash_algo(the_repository, hash_algo); repo_set_hash_algo(the_repository, hash_algo);
} }


/*
* Fallback to SHA1 if we are running outside of a repository.
*
* TODO: Figure out and implement a way to detect the hash algorithm in use by the
* the index file passed in and use that instead.
*/
if (!the_hash_algo)
repo_set_hash_algo(the_repository, GIT_HASH_SHA1);

hashsz = the_hash_algo->rawsz; hashsz = the_hash_algo->rawsz;


if (fread(top_index, 2 * 4, 1, stdin) != 1) if (fread(top_index, 2 * 4, 1, stdin) != 1)

4
t/t5300-pack-object.sh
View File

@ -523,6 +523,10 @@ test_expect_success 'index-pack --strict <pack> works in non-repo' '
test_path_is_file foo.idx test_path_is_file foo.idx
' '


test_expect_success SHA1 'show-index works OK outside a repository' '
nongit git show-index <foo.idx
'

test_expect_success !PTHREADS,!FAIL_PREREQS \ test_expect_success !PTHREADS,!FAIL_PREREQS \
'index-pack --threads=N or pack.threads=N warns when no pthreads' ' 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
test_must_fail git index-pack --threads=2 2>err && test_must_fail git index-pack --threads=2 2>err &&