Skip to content

Commit 2f42bd7

Browse files
committed
Merge branch 'as/show-index-uninitialized-hash' into jch
Regression fix for 'show-index' when run outside of a repository. * as/show-index-uninitialized-hash: show-index: fix uninitialized hash function
2 parents ddedb0e + 0142990 commit 2f42bd7

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

builtin/show-index.c

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

41+
if (!the_hash_algo)
42+
repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
43+
4144
hashsz = the_hash_algo->rawsz;
4245

4346
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)