averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'as/show-index-uninitialized-hash' into jch

Browse Source 
Regression fix for 'show-index' when run outside of a repository.

* as/show-index-uninitialized-hash:
  show-index: fix uninitialized hash function
This commit is contained in:
Taylor Blau
2024-11-01 15:40:29 -04:00
parent ddedb0e9d1 014299066b
commit 2f42bd7ce8
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/show-index.c
View File

@@ -38,6 +38,9 @@ int cmd_show_index(int argc,
repo_set_hash_algo(the_repository, hash_algo); repo_set_hash_algo(the_repository, hash_algo);
} }
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 &&