X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=hash-object.c;h=ccba11cb32fb6989c9c0365097de2fa39197de25;hb=8bf14d6ef9245f3b81d24cb7725a868f62343277;hp=c8c9adb3aa789729e3c53a0d9ff1135367e93ee0;hpb=80bd6f3064a6009cd18a4dab9ce6d29681cec4af;p=git.git

diff --git a/hash-object.c b/hash-object.c
index c8c9adb3..ccba11cb 100644
--- a/hash-object.c
+++ b/hash-object.c
@@ -29,6 +29,8 @@ int main(int argc, char **argv)
 	int i;
 	const char *type = "blob";
 	int write_object = 0;
+	const char *prefix = NULL;
+	int prefix_length = -1;
 
 	for (i = 1 ; i < argc; i++) {
 		if (!strcmp(argv[i], "-t")) {
@@ -36,10 +38,20 @@ int main(int argc, char **argv)
 				die(hash_object_usage);
 			type = argv[i];
 		}
-		else if (!strcmp(argv[i], "-w"))
+		else if (!strcmp(argv[i], "-w")) {
+			if (prefix_length < 0) {
+				prefix = setup_git_directory();
+				prefix_length = prefix ? strlen(prefix) : 0;
+			}
 			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);
+		}
 	}
 	return 0;
 }