mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

* as/show-index-uninitialized-hash:
  t5300: add test for 'show-index --object-format'
  show-index: fix uninitialized hash function
This commit is contained in:
Junio C Hamano
2024-12-23 09:32:12 -08:00
parent 4156b6a741 34d3f2a984
commit 002a8a9d36
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/show-index.c
View File

@ -40,6 +40,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)

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

@ -525,6 +525,24 @@ 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
'
for hash in sha1 sha256
do
test_expect_success 'show-index works OK outside a repository with hash algo passed in via --object-format' '
test_when_finished "rm -rf explicit-hash-$hash" &&
git init --object-format=$hash explicit-hash-$hash &&
test_commit -C explicit-hash-$hash one &&
git -C explicit-hash-$hash rev-parse one >in &&
git -C explicit-hash-$hash pack-objects explicit-hash-$hash <in &&
idx=$(echo explicit-hash-$hash/explicit-hash-$hash*.idx) &&
nongit git show-index --object-format=$hash <"$idx" >actual &&
test_line_count = 1 actual
'
done
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 &&