X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-write-tree.c;h=b89d02efec813d33f8540d2a6d433a94ce1e0a31;hb=872c930dcb048c1a2b50e6ce881c521dcee15e23;hp=391de53972ebf77d2e08f1b405969e065bd8b371;hpb=6169a89c4fd29cf9c747bab7bd310877328bc7e2;p=git.git

diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index 391de5397..b89d02efe 100644
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -52,6 +52,8 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
 	if (prefix) {
 		struct cache_tree *subtree =
 			cache_tree_find(active_cache_tree, prefix);
+		if (!subtree)
+			die("git-write-tree: prefix %s not found", prefix);
 		hashcpy(sha1, subtree->sha1);
 	}
 	else
@@ -70,6 +72,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
 	const char *prefix = NULL;
 	unsigned char sha1[20];
 
+	git_config(git_default_config);
 	while (1 < argc) {
 		const char *arg = argv[1];
 		if (!strcmp(arg, "--missing-ok"))