X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=write-tree.c;h=f866059f24bacd314fa4a979334a9893dbfc19ba;hb=9470657ad0d0472e3e3c2e352334f60e7bd777c1;hp=a794ea15b89ece14570bb8bf3ed0b42ab65cd413;hpb=7323aa11af1527d5a786d93ee34401c72c5df051;p=git.git

diff --git a/write-tree.c b/write-tree.c
index a794ea15..f866059f 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -5,6 +5,8 @@
  */
 #include "cache.h"
 
+static int missing_ok = 0;
+
 static int check_valid_sha1(unsigned char *sha1)
 {
 	int ret;
@@ -61,7 +63,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
 			sha1 = subdir_sha1;
 		}
 
-		if (check_valid_sha1(sha1) < 0)
+		if (!missing_ok && check_valid_sha1(sha1) < 0)
 			exit(1);
 
 		entrylen = pathlen - baselen;
@@ -81,11 +83,26 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
 	return nr;
 }
 
+static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
+
 int main(int argc, char **argv)
 {
 	int i, funny;
-	int entries = read_cache();
+	int entries;
 	unsigned char sha1[20];
+	
+	setup_git_directory();
+
+	entries = read_cache();
+	if (argc == 2) {
+		if (!strcmp(argv[1], "--missing-ok"))
+			missing_ok = 1;
+		else
+			die(write_tree_usage);
+	}
+	
+	if (argc > 2)
+		die("too many options");
 
 	if (entries < 0)
 		die("git-write-tree: error reading cache");