Merge branch 'ao/p4-has-branch-prefix-fix'

diff --git a/builtin/diff.c b/builtin/diff.c
index 52c98a9217c60a60f0012dbdafbb193e78ec8a33..b7a9405d9fbec46edf99637557d7499fb58c4d77 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -318,7 +318,9 @@ 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);
 
        init_revisions(&rev, prefix);