Skip to contentSkip to conversation

Avoid ambiguous error message if pack.idx header is wrong

PATCH New Luiz Fernando N. Capitulino 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore

Luiz Fernando N. Capitulino

author
#0 lore raw

PATCH 1/1 Avoid ambiguous error message if pack.idx header is wrong

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 <[email protected]>
---
 sha1_file.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sha1_file.c +2 -2
index aca741b..b219d4d 100644
@@ -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 */
Signature · 6 lines
1.5.3.GIT



-- 
Luiz Fernando N. Capitulino