X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=eaff4441963409ea058722ef08fcf181a34a0c96;hb=ec26b4d6b004b6529c79e995a543945076c683aa;hp=be29b3fe11a370e53d3dce6a43dfccdc0e22ae2c;hpb=f2fea68a0fc29c6378748853abb01aed1c462a50;p=git.git

diff --git a/read-tree.c b/read-tree.c
index be29b3fe..eaff4441 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -337,7 +337,7 @@ static void check_updates(struct cache_entry **src, int nr)
 		if (ce->ce_flags & mask) {
 			ce->ce_flags &= ~mask;
 			if (update)
-				checkout_entry(ce, &state);
+				checkout_entry(ce, &state, NULL);
 		}
 	}
 	if (total) {
@@ -717,6 +717,7 @@ int main(int argc, char **argv)
 	merge_fn_t fn = NULL;
 
 	setup_git_directory();
+	git_config(git_default_config);
 
 	newfd = hold_index_file_for_update(&cache_file, get_index_file());
 	if (newfd < 0)