X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=unpack-file.c;h=ccddf1d4b0cf7fd3a699d8b33cf5bc4c5c4435b7;hp=3accb974dd448233a01e82ab1d6e3599d825fa9e;hb=HEAD;hpb=be1295d16a2593dcf468fef7d9e811d057d9039f

diff --git a/unpack-file.c b/unpack-file.c
index 3accb974..ccddf1d4 100644
--- a/unpack-file.c
+++ b/unpack-file.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "blob.h"
 
 static char *create_temp_file(unsigned char *sha1)
 {
@@ -9,7 +10,7 @@ static char *create_temp_file(unsigned char *sha1)
 	int fd;
 
 	buf = read_sha1_file(sha1, type, &size);
-	if (!buf || strcmp(type, "blob"))
+	if (!buf || strcmp(type, blob_type))
 		die("unable to read blob object %s", sha1_to_hex(sha1));
 
 	strcpy(path, ".merge_file_XXXXXX");
@@ -26,8 +27,10 @@ int main(int argc, char **argv)
 {
 	unsigned char sha1[20];
 
-	if (argc != 2 || get_sha1(argv[1], sha1))
+	if (argc != 2)
 		usage("git-unpack-file <sha1>");
+	if (get_sha1(argv[1], sha1))
+		die("Not a valid object name %s", argv[1]);
 
 	setup_git_directory();
 	git_config(git_default_config);