Merge branch 'rs/strbuf-remove-fix'

diff --git a/builtin/diff.c b/builtin/diff.c
index 7be7806146b7e10be035ef6d3654bbd1c1c424a7..7f91f6d2267db962fb7c25e92983afd4e811d43e 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -319,6 +319,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 
        if (!no_index)
                gitmodules_config();
+       init_diff_ui_defaults();
        git_config(git_diff_ui_config, NULL);
        precompose_argv(argc, argv);