X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-objects.c;h=48c1ee7968cc6b40cb02cd99d35e66630f922041;hb=17a10f3709c211769c9fada79bd1608aa64f6080;hp=815a1b382b1f92686efd00bee5794a8480d7f7b7;hpb=3f6726e1f112d221bd2a919e9b1b2927aeef6150;p=git.git diff --git a/unpack-objects.c b/unpack-objects.c index 815a1b382..48c1ee796 100644 --- a/unpack-objects.c +++ b/unpack-objects.c @@ -2,6 +2,10 @@ #include "object.h" #include "delta.h" #include "pack.h" +#include "blob.h" +#include "commit.h" +#include "tag.h" +#include "tree.h" #include @@ -148,10 +152,10 @@ static int unpack_non_delta_entry(enum object_type kind, unsigned long size) const char *type; switch (kind) { - case OBJ_COMMIT: type = "commit"; break; - case OBJ_TREE: type = "tree"; break; - case OBJ_BLOB: type = "blob"; break; - case OBJ_TAG: type = "tag"; break; + case OBJ_COMMIT: type = commit_type; break; + case OBJ_TREE: type = tree_type; break; + case OBJ_BLOB: type = blob_type; break; + case OBJ_TAG: type = tag_type; break; default: die("bad type %d", kind); } if (!dry_run) @@ -237,11 +241,6 @@ static void unpack_one(unsigned nr, unsigned total) } } -/* - * We unpack from the end, older files first. Now, usually - * there are deltas etc, so we'll not actually write the - * objects in that order, but we might as well try.. - */ static void unpack_all(void) { int i;