diff --git a/hash-object.c b/hash-object.c
index 18f5017f51bcac5798e959991be37c7cd6d70528..61e7160b361f60e6d673ab64aa3d22c1a783d057 100644 (file)
--- a/hash-object.c
+++ b/hash-object.c
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] == '-') {
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);
no_more_flags = 1;
}
}
+ if (hashstdin)
+ hash_stdin(type, write_object);
return 0;
}