X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=hash-object.c;h=61e7160b361f60e6d673ab64aa3d22c1a783d057;hb=c6fef0bbea485ff8aec979177ee5c1c568fffc55;hp=18f5017f51bcac5798e959991be37c7cd6d70528;hpb=045f5759c97746589a067461e50fad16f60711ac;p=git.git

diff --git a/hash-object.c b/hash-object.c
index 18f5017f5..61e7160b3 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -41,6 +41,9 @@ int main(int argc, char **argv)
 	const char *prefix = NULL;
 	int prefix_length = -1;
 	int no_more_flags = 0;
+	int hashstdin = 0;
+
+	git_config(git_default_config);
 
 	for (i = 1 ; i < argc; i++) {
 		if (!no_more_flags && argv[i][0] == '-') {
@@ -63,13 +66,20 @@ 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);
+				if (hashstdin)
+					die("Multiple --stdin arguments are not supported");
+				hashstdin = 1;
 			}
 			else
 				usage(hash_object_usage);
 		}
 		else {
 			const char *arg = argv[i];
+
+			if (hashstdin) {
+				hash_stdin(type, write_object);
+				hashstdin = 0;
+			}
 			if (0 <= prefix_length)
 				arg = prefix_filename(prefix, prefix_length,
 						      arg);
@@ -77,5 +87,7 @@ int main(int argc, char **argv)
 			no_more_flags = 1;
 		}
 	}
+	if (hashstdin)
+		hash_stdin(type, write_object);
 	return 0;
 }