Merge branch 'lv/status-say-working-tree-not-directory' into maint

diff --git a/builtin/diff.c b/builtin/diff.c
index d6b8f9834d8f1ef26da5994a24db73c1b0b83221..b7a9405d9fbec46edf99637557d7499fb58c4d77 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -318,6 +318,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);