git-merge-one-file: do not worry about 'rmdir -p' not removing directory.

diff --git a/environment.c b/environment.c
index 1dc7af56cf93e46c456eaa13f8f8150258abe43c..0886ad38f94ddb897629d832160333921ac89481 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -12,6 +12,9 @@
 char git_default_email[MAX_GITNAME];
 char git_default_name[MAX_GITNAME];
 int trust_executable_bit = 1;
+int only_use_symrefs = 0;
+int repository_format_version = 0;
+char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
 
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
        *git_graft_file;