From: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail•com>
To: git@vger•kernel.org
Cc: ps@pks•im, sandals@crustytoothpaste•net, gitster@pobox•com,
Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail•com>
Subject: [PATCH V2 2/2] show-index: use gettext wrapping in user facing error messages
Date: Fri, 30 Jan 2026 21:01:24 +0530 [thread overview]
Message-ID: <20260130153603.290196-3-shreyanshpaliwalcmsmn@gmail.com> (raw)
In-Reply-To: <20260130153603.290196-1-shreyanshpaliwalcmsmn@gmail.com>
Multiple 'die()' calls in show-index.c use literal strings directly.
Wrap all user-facing 'die()' messages with '_()' so they can be translated
via gettext, this ensures better support for users.
Signed-off-by: Shreyansh Paliwal <shreyanshpaliwalcmsmn@gmail•com>
---
builtin/show-index.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/builtin/show-index.c b/builtin/show-index.c
index 45795da2da..24f0230967 100644
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -55,23 +55,23 @@ int cmd_show_index(int argc,
hashsz = the_hash_algo->rawsz;
if (fread(top_index, 2 * 4, 1, stdin) != 1)
- die("unable to read header");
+ die(_("unable to read header"));
if (top_index[0] == htonl(PACK_IDX_SIGNATURE)) {
version = ntohl(top_index[1]);
if (version < 2 || version > 2)
- die("unknown index version");
+ die(_("unknown index version"));
if (fread(top_index, 256 * 4, 1, stdin) != 1)
- die("unable to read index");
+ die(_("unable to read index"));
} else {
version = 1;
if (fread(&top_index[2], 254 * 4, 1, stdin) != 1)
- die("unable to read index");
+ die(_("unable to read index"));
}
nr = 0;
for (i = 0; i < 256; i++) {
unsigned n = ntohl(top_index[i]);
if (n < nr)
- die("corrupt index file");
+ die(_("corrupt index file"));
nr = n;
}
if (version == 1) {
@@ -79,7 +79,7 @@ int cmd_show_index(int argc,
unsigned int offset, entry[(GIT_MAX_RAWSZ + 4) / sizeof(unsigned int)];
if (fread(entry, 4 + hashsz, 1, stdin) != 1)
- die("unable to read entry %u/%u", i, nr);
+ die(_("unable to read entry %u/%u"), i, nr);
offset = ntohl(entry[0]);
printf("%u %s\n", offset, hash_to_hex((void *)(entry+1)));
}
@@ -93,15 +93,15 @@ int cmd_show_index(int argc,
ALLOC_ARRAY(entries, nr);
for (i = 0; i < nr; i++) {
if (fread(entries[i].oid.hash, hashsz, 1, stdin) != 1)
- die("unable to read sha1 %u/%u", i, nr);
+ die(_("unable to read sha1 %u/%u"), i, nr);
entries[i].oid.algo = hash_algo_by_ptr(the_hash_algo);
}
for (i = 0; i < nr; i++)
if (fread(&entries[i].crc, 4, 1, stdin) != 1)
- die("unable to read crc %u/%u", i, nr);
+ die(_("unable to read crc %u/%u"), i, nr);
for (i = 0; i < nr; i++)
if (fread(&entries[i].off, 4, 1, stdin) != 1)
- die("unable to read 32b offset %u/%u", i, nr);
+ die(_("unable to read 32b offset %u/%u"), i, nr);
for (i = 0; i < nr; i++) {
uint64_t offset;
uint32_t off = ntohl(entries[i].off);
@@ -110,9 +110,9 @@ int cmd_show_index(int argc,
} else {
uint32_t off64[2];
if ((off & 0x7fffffff) != off64_nr)
- die("inconsistent 64b offset index");
+ die(_("inconsistent 64b offset index"));
if (fread(off64, 8, 1, stdin) != 1)
- die("unable to read 64b offset %u", off64_nr);
+ die(_("unable to read 64b offset %u"), off64_nr);
offset = (((uint64_t)ntohl(off64[0])) << 32) |
ntohl(off64[1]);
off64_nr++;
--
2.52.0
next prev parent reply other threads:[~2026-01-30 15:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 14:05 [RFC][PATCH 0/3] show-index: modernize and implement auto-detection of hash algorithm Shreyansh Paliwal
2026-01-20 14:05 ` [PATCH 1/3] show-index: implement automatic hash detection Shreyansh Paliwal
2026-01-20 18:07 ` Junio C Hamano
2026-01-21 8:09 ` Patrick Steinhardt
2026-01-21 10:31 ` Shreyansh Paliwal
2026-01-23 7:22 ` Patrick Steinhardt
2026-01-23 16:08 ` Shreyansh Paliwal
2026-01-23 20:29 ` brian m. carlson
2026-01-21 10:28 ` Shreyansh Paliwal
2026-01-20 14:05 ` [PATCH 2/3] show-index: use gettext wrapping in error messages Shreyansh Paliwal
2026-01-20 14:05 ` [PATCH 3/3] show-index: remove global state variables Shreyansh Paliwal
2026-01-21 10:39 ` Phillip Wood
2026-01-21 12:47 ` Shreyansh Paliwal
2026-01-21 17:23 ` Junio C Hamano
2026-01-29 15:36 ` [PATCH] show-index: warn when falling back to SHA-1 outside a repository Shreyansh Paliwal
2026-01-29 23:03 ` Junio C Hamano
2026-01-30 8:59 ` Shreyansh Paliwal
2026-01-29 23:12 ` brian m. carlson
2026-01-30 9:04 ` Shreyansh Paliwal
2026-01-30 13:40 ` Patrick Steinhardt
2026-01-30 17:01 ` Junio C Hamano
2026-01-30 15:31 ` [PATCH V2 0/2] show-index: add warning and wrap error messages with gettext Shreyansh Paliwal
2026-01-30 15:31 ` [PATCH V2 1/2] show-index: warn when falling back to SHA-1 outside a repository Shreyansh Paliwal
2026-01-30 15:31 ` Shreyansh Paliwal [this message]
2026-01-30 17:07 ` [PATCH V2 0/2] show-index: add warning and wrap error messages with gettext Junio C Hamano
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=20260130153603.290196-3-shreyanshpaliwalcmsmn@gmail.com \
--to=shreyanshpaliwalcmsmn@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=ps@pks$(echo .)im \
--cc=sandals@crustytoothpaste$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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