Skip to content

Commit 4da8d90

Browse files
quanta-ktgitster
authored andcommitted
show-index: fix uninitialized hash function
In c8aed5e (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6a11438 commit 4da8d90

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

builtin/show-index.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ int cmd_show_index(int argc,
3838
repo_set_hash_algo(the_repository, hash_algo);
3939
}
4040

41+
/*
42+
* Fallback to SHA1 if we are running outside of a repository.
43+
*
44+
* TODO: Figure out and implement a way to detect the hash algorithm in use by the
45+
* the index file passed in and use that instead.
46+
*/
47+
if (!the_hash_algo)
48+
repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
49+
4150
hashsz = the_hash_algo->rawsz;
4251

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

t/t5300-pack-object.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,10 @@ test_expect_success 'index-pack --strict <pack> works in non-repo' '
523523
test_path_is_file foo.idx
524524
'
525525

526+
test_expect_success SHA1 'show-index works OK outside a repository' '
527+
nongit git show-index <foo.idx
528+
'
529+
526530
test_expect_success !PTHREADS,!FAIL_PREREQS \
527531
'index-pack --threads=N or pack.threads=N warns when no pthreads' '
528532
test_must_fail git index-pack --threads=2 2>err &&

0 commit comments

Comments
 (0)