summaryrefslogtreecommitdiffstats
path: root/builtin
diff options
context:
space:
mode:
authorAbhijeet Sonar <abhijeet.nkt@gmail.com>2024-11-09 10:27:38 +0100
committerJunio C Hamano <gitster@pobox.com>2024-11-11 04:16:59 +0100
commit4da8d90fdda420e981b49452719fc4aea322e815 (patch)
tree7b051bdfe20d71faab9f0fc9e6e40f0594fafc08 /builtin
parentThe fifth batch (diff)
downloadgit-4da8d90fdda420e981b49452719fc4aea322e815.tar.xz
git-4da8d90fdda420e981b49452719fc4aea322e815.zip
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/show-index.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin/show-index.c b/builtin/show-index.c
index f164c01bbe..b5e337869d 100644
--- 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)