[PATCH] clarify some error messages wrt unknown object types
flat view
DORMANTno replies
From: Nicolas Pitre <hidden>
Date: 2016-08-11 20:47:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
If ever new object types are added for future extensions then better
have current git version report them as "unknown" instead of
"corrupted".
Signed-off-by: Nicolas Pitre <redacted>
---
diff --git a/index-pack.c b/index-pack.c
index 6d6c92b..35be3e9 100644
--- a/index-pack.c
+++ b/index-pack.c@@ -268,7 +268,7 @@ static void *unpack_raw_entry(struct object_entry *obj, union delta_base *delta_ case OBJ_TAG: break; default: - bad_object(obj->offset, "bad object type %d", obj->type); + bad_object(obj->offset, "unknown object type %d", obj->type); } obj->hdr_size = consumed_bytes - obj->offset;
diff --git a/sha1_file.c b/sha1_file.c
index 63f416b..1c4df5b 100644
--- a/sha1_file.c
+++ b/sha1_file.c@@ -1013,7 +1013,7 @@ void packed_object_info_detail(struct packed_git *p, for (;;) { switch (kind) { default: - die("corrupted pack file %s containing object of kind %d", + die("pack %s contains unknown object type %d", p->pack_name, kind); case OBJ_COMMIT: case OBJ_TREE:
@@ -1063,7 +1063,7 @@ static int packed_object_info(struct packed_git *p, unsigned long offset, strcpy(type, type_names[kind]); break; default: - die("corrupted pack file %s containing object of kind %d", + die("pack %s contains unknown object type %d", p->pack_name, kind); }