X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=hash-object.c;h=18f5017f51bcac5798e959991be37c7cd6d70528;hb=957d6ea78fcbe71481a6f46a58768e100f7908e0;hp=5f89e64c13d6f13fd832309041a6a9fa9d0bca5c;hpb=b4d2b04c9b6dc42c0bcf0513b9d8f731ec26db82;p=git.git diff --git a/hash-object.c b/hash-object.c index 5f89e64c1..18f5017f5 100644 --- a/hash-object.c +++ b/hash-object.c @@ -7,7 +7,7 @@ #include "cache.h" #include "blob.h" -static void hash_object(const char *path, const char *type, int write_object) +static void hash_object(const char *path, enum object_type type, int write_object) { int fd; struct stat st; @@ -15,7 +15,7 @@ static void hash_object(const char *path, const char *type, int write_object) fd = open(path, O_RDONLY); if (fd < 0 || fstat(fd, &st) < 0 || - index_fd(sha1, fd, &st, write_object, type)) + index_fd(sha1, fd, &st, write_object, type, path)) die(write_object ? "Unable to add %s to database" : "Unable to hash %s", path); @@ -73,7 +73,7 @@ int main(int argc, char **argv) if (0 <= prefix_length) arg = prefix_filename(prefix, prefix_length, arg); - hash_object(arg, type, write_object); + hash_object(arg, type_from_string(type), write_object); no_more_flags = 1; } }