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 <lcapitulino@mandriva.com.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_file.c b/sha1_file.c
index aca741b79ce3cdc28f0eb5bdc6848ddba6da8f35..b219d4d5f246eef13c3fe22cd39497b621d7cc4b 100644 (file)
--- 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);
                 */
                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) {
                /*
                }
        } 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);
                        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 */
                }
                if (idx_size != min_size) {
                        /* make sure we can deal with large pack offsets */