X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=hash-object.c;h=5f89e64c13d6f13fd832309041a6a9fa9d0bca5c;hb=396988e0b9cd00d5d13edb157b91dbd5050ef99f;hp=62279368b832046f3e5d6136cc6560dfa7771fef;hpb=5e80092f7e6db09a40a62e837ca3f74f0bc5ad73;p=git.git

diff --git a/hash-object.c b/hash-object.c
index 62279368b..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)
 {
@@ -21,13 +22,21 @@ static void hash_object(const char *path, const char *type, int write_object)
 	printf("%s\n", sha1_to_hex(sha1));
 }
 
+static void hash_stdin(const char *type, int write_object)
+{
+	unsigned char sha1[20];
+	if (index_pipe(sha1, 0, type, write_object))
+		die("Unable to add stdin to database");
+	printf("%s\n", sha1_to_hex(sha1));
+}
+
 static const char hash_object_usage[] =
-"git-hash-object [-t <type>] [-w] <file>...";
+"git-hash-object [-t <type>] [-w] [--stdin] <file>...";
 
 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;
@@ -37,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")) {
@@ -53,8 +62,11 @@ int main(int argc, char **argv)
 			}
 			else if (!strcmp(argv[i], "--help"))
 				usage(hash_object_usage);
+			else if (!strcmp(argv[i], "--stdin")) {
+				hash_stdin(type, write_object);
+			}
 			else
-				die(hash_object_usage);
+				usage(hash_object_usage);
 		}
 		else {
 			const char *arg = argv[i];