X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=hash-object.c;h=62279368b832046f3e5d6136cc6560dfa7771fef;hb=2777ef76be7174f698b3f53cc4ff38b4118de320;hp=c8c9adb3aa789729e3c53a0d9ff1135367e93ee0;hpb=2b64f88f09ae2169ec85652b46897574e352936d;p=git.git

diff --git a/hash-object.c b/hash-object.c
index c8c9adb3..62279368 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -29,17 +29,41 @@ int main(int argc, char **argv)
 	int i;
 	const char *type = "blob";
 	int write_object = 0;
+	const char *prefix = NULL;
+	int prefix_length = -1;
+	int no_more_flags = 0;
 
 	for (i = 1 ; i < argc; i++) {
-		if (!strcmp(argv[i], "-t")) {
-			if (argc <= ++i)
+		if (!no_more_flags && argv[i][0] == '-') {
+			if (!strcmp(argv[i], "-t")) {
+				if (argc <= ++i)
+					die(hash_object_usage);
+				type = argv[i];
+			}
+			else if (!strcmp(argv[i], "-w")) {
+				if (prefix_length < 0) {
+					prefix = setup_git_directory();
+					prefix_length =
+						prefix ? strlen(prefix) : 0;
+				}
+				write_object = 1;
+			}
+			else if (!strcmp(argv[i], "--")) {
+				no_more_flags = 1;
+			}
+			else if (!strcmp(argv[i], "--help"))
+				usage(hash_object_usage);
+			else
 				die(hash_object_usage);
-			type = argv[i];
 		}
-		else if (!strcmp(argv[i], "-w"))
-			write_object = 1;
-		else
-			hash_object(argv[i], type, write_object);
+		else {
+			const char *arg = argv[i];
+			if (0 <= prefix_length)
+				arg = prefix_filename(prefix, prefix_length,
+						      arg);
+			hash_object(arg, type, write_object);
+			no_more_flags = 1;
+		}
 	}
 	return 0;
 }