git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Avoid ambiguous error message if pack.idx header is wrong
@ 2007-08-14 19:42 Luiz Fernando N. Capitulino
  0 siblings, 0 replies; only message in thread
From: Luiz Fernando N. Capitulino @ 2007-08-14 19:42 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git


Print the index version when an error occurs so the user
knows what type of header (and size) we thought the index
should have had.

Signed-off-by: Luiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
---
 sha1_file.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index aca741b..b219d4d 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -497,7 +497,7 @@ static int check_packed_git_idx(const char *path,  struct packed_git *p)
 		 */
 		if (idx_size != 4*256 + nr * 24 + 20 + 20) {
 			munmap(idx_map, idx_size);
-			return error("wrong index file size in %s", path);
+			return error("wrong index v1 file size in %s", path);
 		}
 	} else if (version == 2) {
 		/*
@@ -519,7 +519,7 @@ static int check_packed_git_idx(const char *path,  struct packed_git *p)
 			max_size += (nr - 1)*8;
 		if (idx_size < min_size || idx_size > max_size) {
 			munmap(idx_map, idx_size);
-			return error("wrong index file size in %s", path);
+			return error("wrong index v2 file size in %s", path);
 		}
 		if (idx_size != min_size) {
 			/* make sure we can deal with large pack offsets */
-- 
1.5.3.GIT



-- 
Luiz Fernando N. Capitulino

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-08-14 19:43 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-14 19:42 [PATCH] Avoid ambiguous error message if pack.idx header is wrong Luiz Fernando N. Capitulino

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).