X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=hash-object.c;h=18f5017f51bcac5798e959991be37c7cd6d70528;hb=957d6ea78fcbe71481a6f46a58768e100f7908e0;hp=6502b5b3d1307a4cd7e8761c96aa7ecd5e70559f;hpb=b4a081b428c607f98c5d0a0eec8d543dc1f2abcd;p=git.git

diff --git a/hash-object.c b/hash-object.c
index 6502b5b3d..18f5017f5 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -2,11 +2,12 @@
  * GIT - The information manager from hell
  *
  * Copyright (C) Linus Torvalds, 2005
- * Copyright (C) Junio C Hamano, 2005 
+ * Copyright (C) Junio C Hamano, 2005
  */
 #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;
@@ -14,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);
@@ -35,7 +36,7 @@ static const char hash_object_usage[] =
 int main(int argc, char **argv)
 {
 	int i;
-	const char *type = "blob";
+	const char *type = blob_type;
 	int write_object = 0;
 	const char *prefix = NULL;
 	int prefix_length = -1;
@@ -45,7 +46,7 @@ int main(int argc, char **argv)
 		if (!no_more_flags && argv[i][0] == '-') {
 			if (!strcmp(argv[i], "-t")) {
 				if (argc <= ++i)
-					die(hash_object_usage);
+					usage(hash_object_usage);
 				type = argv[i];
 			}
 			else if (!strcmp(argv[i], "-w")) {
@@ -65,14 +66,14 @@ int main(int argc, char **argv)
 				hash_stdin(type, write_object);
 			}
 			else
-				die(hash_object_usage);
-		} 
+				usage(hash_object_usage);
+		}
 		else {
 			const char *arg = argv[i];
 			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;
 		}
 	}