X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=hash-object.c;h=5f89e64c13d6f13fd832309041a6a9fa9d0bca5c;hb=8719f93b5619a0df99cec6e919a260f01ab76184;hp=6502b5b3d1307a4cd7e8761c96aa7ecd5e70559f;hpb=9086a18cb81f99fff943b36830396ac8c37c7e9f;p=git.git diff --git a/hash-object.c b/hash-object.c index 6502b5b3d..5f89e64c1 100644 --- a/hash-object.c +++ b/hash-object.c @@ -2,9 +2,10 @@ * 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) { @@ -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,8 +66,8 @@ 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)