combine-diff: better hunk splitting.

diff --git a/environment.c b/environment.c
index 3f194732e539918413277dbfda6e11924eda43bb..0596fc647be37343371ae5a266906dab35707076 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -14,6 +14,8 @@ 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";
+int shared_repository = 0;
 
 static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
        *git_graft_file;