Merge branch 'tq/t1510'

diff --git a/config.c b/config.c
index 40d46b3325ed7787c8645f150e73a1f5f05cc5e3..9f8ca18f7b2b6f5423c2833df690ff4c3da1a4d9 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1239,6 +1239,11 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.checkroundtripencoding")) {
+               check_roundtrip_encoding = xstrdup(value);
+               return 0;
+       }
+
        if (!strcmp(var, "core.notesref")) {
                notes_ref_name = xstrdup(value);
                return 0;