diff options
| author | Nicolas Pitre <nico@cam.org> | 2006-12-20 19:34:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-20 19:46:34 +0100 |
| commit | 08a19d873c16aa6127bf4c40cf99a9dd19558a0c (patch) | |
| tree | 8f2e561d52364489ce05b513b754a9abb8abce46 | |
| parent | simplify inclusion of system header files. (diff) | |
| download | git-08a19d873c16aa6127bf4c40cf99a9dd19558a0c.tar.xz git-08a19d873c16aa6127bf4c40cf99a9dd19558a0c.zip | |
clarify some error messages wrt unknown object types
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 <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | index-pack.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/index-pack.c b/index-pack.c index 43e007f823..5f6d128a83 100644 --- a/index-pack.c +++ b/index-pack.c @@ -266,7 +266,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 63f416bb5a..1c4df5b73e 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); } if (sizep) |