X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=write-tree.c;h=895e7a359d108312918c27d98c7b529f2e25e300;hb=6bd20358a9b831b3b545284188871bc844245c25;hp=7a4f691d8ab8f6f560685ec6fe71cf2d82e8a018;hpb=f4c6f2d328e2f30ad63fdfca26a5e4a11cef35bf;p=git.git

diff --git a/write-tree.c b/write-tree.c
index 7a4f691d..895e7a35 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -8,8 +8,10 @@
 #include "cache-tree.h"
 
 static int missing_ok = 0;
+static char *prefix = NULL;
 
-static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
+static const char write_tree_usage[] =
+"git-write-tree [--missing-ok] [--prefix=<prefix>/]";
 
 static struct cache_file cache_file;
 
@@ -21,13 +23,18 @@ int main(int argc, char **argv)
 
 	newfd = hold_index_file_for_update(&cache_file, get_index_file());
 	entries = read_cache();
-	if (argc == 2) {
-		if (!strcmp(argv[1], "--missing-ok"))
+
+	while (1 < argc) {
+		char *arg = argv[1];
+		if (!strcmp(arg, "--missing-ok"))
 			missing_ok = 1;
+		else if (!strncmp(arg, "--prefix=", 9))
+			prefix = arg + 9;
 		else
 			die(write_tree_usage);
+		argc--; argv++;
 	}
-	
+
 	if (argc > 2)
 		die("too many options");
 
@@ -54,6 +61,12 @@ int main(int argc, char **argv)
 		 * performance penalty and not a big deal.
 		 */
 	}
-	printf("%s\n", sha1_to_hex(active_cache_tree->sha1));
+	if (prefix) {
+		struct cache_tree *subtree =
+			cache_tree_find(active_cache_tree, prefix);
+		printf("%s\n", sha1_to_hex(subtree->sha1));
+	}
+	else
+		printf("%s\n", sha1_to_hex(active_cache_tree->sha1));
 	return 0;
 }