Merge http://www.kernel.org/pub/scm/gitk/gitk

[git.git] / config.c

diff --git a/config.c b/config.c
index 0c43d76..34584f6 100644 (file)
--- a/config.c
+++ b/config.c
@@ -11,7 +11,7 @@
 #define MAXNAME (256)
 
 static FILE *config_file;
-static char *config_file_name;
+static const char *config_file_name;
 static int config_linenr;
 static int get_next_char(void)
 {
@@ -237,6 +237,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "i18n.commitencoding")) {
+               strncpy(git_commit_encoding, value, sizeof(git_commit_encoding));
+               return 0;
+       }
+
        /* Add other config variables here.. */
        return 0;
 }