Merge branch 'jc/custom-comment-char'

diff --git a/config.c b/config.c
index 3f638e3c00c9ee5000a0f3d3518fd1e7bc1457b6..5a20de3fa62b46d73cc0b13bf5d50aefac78fac6 100644 (file)
--- a/config.c
+++ b/config.c
@@ -723,6 +723,14 @@ static int git_default_core_config(const char *var, const char *value)
        if (!strcmp(var, "core.editor"))
                return git_config_string(&editor_program, var, value);
 
+       if (!strcmp(var, "core.commentchar")) {
+               const char *comment;
+               int ret = git_config_string(&comment, var, value);
+               if (!ret)
+                       comment_line_char = comment[0];
+               return ret;
+       }
+
        if (!strcmp(var, "core.askpass"))
                return git_config_string(&askpass_program, var, value);