From: Abhijeet Sonar <abhijeet.nkt@gmail.com>
To: git@vger.kernel.org
Cc: Abhijeet Sonar <abhijeet.nkt@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>
Subject: [PATCH v2] show-index: fix uninitialized hash function
Date: Mon, 15 Jul 2024 15:53:43 +0530 [thread overview]
Message-ID: <20240715102344.182388-1-abhijeet.nkt@gmail.com> (raw)
In-Reply-To: <xmqqbk32oc7g.fsf@gitster.g>
As stated in the docs, show-index should use SHA1 as the default hash algorithm
when run outsize of a repository. However, 'the_hash_algo' is currently left
uninitialized if we are not in a repository and no explicit hash function is
specified, causing a crash. Fix it by falling back to SHA1 when it is found
uninitialized. Also add test that verifies this behaviour.
Signed-off-by: Abhijeet Sonar <abhijeet.nkt@gmail.com>
---
builtin/show-index.c | 3 +++
t/t8101-show-index-hash-function.sh | 15 +++++++++++++++
2 files changed, 18 insertions(+)
create mode 100755 t/t8101-show-index-hash-function.sh
diff --git a/builtin/show-index.c b/builtin/show-index.c
index 540dc3dad1..bb6d9e3c40 100644
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -35,6 +35,9 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
repo_set_hash_algo(the_repository, hash_algo);
}
+ 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/t8101-show-index-hash-function.sh b/t/t8101-show-index-hash-function.sh
new file mode 100755
index 0000000000..2e9308f73c
--- /dev/null
+++ b/t/t8101-show-index-hash-function.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+test_description='git show-index'
+
+. ./test-lib.sh
+
+test_expect_success 'show-index: should not fail outside a repository' '
+ git init --object-format=sha1 && (
+ echo "" | git hash-object -w --stdin | git pack-objects test &&
+ rm -rf .git &&
+ cat test-*.idx | git show-index
+ )
+'
+
+test_done
--
2.45.2.827.g557ae147e6
next prev parent reply other threads:[~2024-07-15 10:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-12 14:23 [PATCH] show-index: fix uninitialized hash function Abhijeet Sonar
2024-07-12 15:35 ` Junio C Hamano
2024-07-15 10:23 ` Abhijeet Sonar [this message]
2024-07-15 16:22 ` Re* [PATCH v2] " Junio C Hamano
2024-10-26 12:09 ` [PATCH v3] " Abhijeet Sonar
2024-10-28 0:10 ` Taylor Blau
2024-10-28 5:35 ` Patrick Steinhardt
2024-10-28 17:42 ` Taylor Blau
2024-11-01 17:28 ` [PATCH v4] " Abhijeet Sonar
2024-11-02 10:29 ` Junio C Hamano
2024-11-02 16:26 ` Abhijeet Sonar
2024-11-04 19:29 ` [PATCH v5 0/2] " Abhijeet Sonar
2024-11-04 19:29 ` [PATCH v5 1/2] " Abhijeet Sonar
2024-11-04 19:29 ` [PATCH v5 2/2] t5300: add test for 'show-index --object-format' Abhijeet Sonar
2024-11-05 1:19 ` Junio C Hamano
2024-11-09 9:27 ` [PATCH v6 0/2] show-index: fix uninitialized hash function Abhijeet Sonar
2024-11-09 9:27 ` [PATCH v6 1/2] " Abhijeet Sonar
2024-11-09 9:27 ` [PATCH v6 2/2] t5300: add test for 'show-index --object-format' Abhijeet Sonar
2024-11-11 3:16 ` [PATCH v6 0/2] show-index: fix uninitialized hash function Junio C Hamano
2024-12-16 8:11 ` Patrick Steinhardt
2024-12-16 16:21 ` Junio C Hamano
2024-10-29 11:54 ` [PATCH v3] " Abhijeet Sonar
2024-10-29 10:30 ` Abhijeet Sonar
2024-10-26 12:17 ` Re* [PATCH v2] " Abhijeet Sonar
2024-07-15 22:07 ` brian m. carlson
2024-07-15 10:31 ` [PATCH] " Abhijeet Sonar
2024-07-12 16:53 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240715102344.182388-1-abhijeet.nkt@gmail.com \
--to=abhijeet.nkt@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).