git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index aec83384298042fc4509605299f82e82745ae675..4abe3c28fbf98542db35c13f618b7088225740e9 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -10,17 +10,18 @@
 #include "builtin.h"
 
 static const char diff_files_usage[] =
-"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|-n|--no-index] [<common diff options>] [<path>...]"
+"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|--no-index] [<common diff options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
 int cmd_diff_files(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
        int nongit = 0;
+       int result;
 
        prefix = setup_git_directory_gently(&nongit);
        init_revisions(&rev, prefix);
-       git_config(git_default_config); /* no "diff" UI options */
+       git_config(git_diff_basic_config); /* no "diff" UI options */
        rev.abbrev = 0;
 
        if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))
@@ -29,5 +30,6 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
                argc = setup_revisions(argc, argv, &rev, NULL);
        if (!rev.diffopt.output_format)
                rev.diffopt.output_format = DIFF_FORMAT_RAW;
-       return run_diff_files_cmd(&rev, argc, argv);
+       result = run_diff_files_cmd(&rev, argc, argv);
+       return diff_result_code(&rev.diffopt, result);
 }