Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

diff --git a/environment.c b/environment.c
index d7e6c657631f05553250a1705ea6c77c375c4bf4..669e498f5a245909725494feda2531f0088f8160 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -11,9 +11,6 @@
 #include "refs.h"
 #include "fmt-merge-msg.h"
 
-char git_default_email[MAX_GITNAME];
-char git_default_name[MAX_GITNAME];
-int user_ident_explicitly_given;
 int trust_executable_bit = 1;
 int trust_ctime = 1;
 int has_symlinks = 1;