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>

diff --git a/builtin/show-index.c b/builtin/show-index.c
index f164c01bbea4003ee97cdc4b3f7131b5b7def9ad..b5e337869d405cce8cc9791f3efbedf8a17a173f 100644 (file)
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -38,6 +38,15 @@ int cmd_show_index(int argc,
                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;
 
        if (fread(top_index, 2 * 4, 1, stdin) != 1)

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 3b9dae331a5ea9dc0bed8a2ee64d5350341dcd06..51fed26cc4c941fbbc7221c1591c2bcb3c95c1d6 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -523,6 +523,10 @@ test_expect_success 'index-pack --strict <pack> works in non-repo' '
        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 \
        'index-pack --threads=N or pack.threads=N warns when no pthreads' '
        test_must_fail git index-pack --threads=2 2>err &&