Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> writes: > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> > --- > Since jk/pack-idx-corruption-safety is already in 'next', can we add > this patch on top? Surrounding strings are handled separately [1] by > another series. > > [1] http://thread.gmane.org/gmane.comp.version-control.git/287661/focus=287678 Thanks, I think this makes sense. Peff--I do not think I missed a reason we shouldn't take this? > > sha1_file.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sha1_file.c b/sha1_file.c > index 4a3a032..b8da68b 100644 > --- a/sha1_file.c > +++ b/sha1_file.c > @@ -1042,7 +1042,7 @@ unsigned char *use_pack(struct packed_git *p, > if (offset > (p->pack_size - 20)) > die("offset beyond end of packfile (truncated pack?)"); > if (offset < 0) > - die("offset before end of packfile (broken .idx?)"); > + die(_("offset before end of packfile (broken .idx?)")); > > if (!win || !in_window(win, offset)) { > if (win) > @@ -2367,11 +2367,11 @@ void check_pack_index_ptr(const struct packed_git *p, const void *vptr) > const unsigned char *start = p->index_data; > const unsigned char *end = start + p->index_size; > if (ptr < start) > - die("offset before start of pack index for %s (corrupt index?)", > + die(_("offset before start of pack index for %s (corrupt index?)"), > p->pack_name); > /* No need to check for underflow; .idx files must be at least 8 bytes */ > if (ptr >= end - 8) > - die("offset beyond end of pack index for %s (truncated index?)", > + die(_("offset beyond end of pack index for %s (truncated index?)"), > p->pack_name); > } -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html