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

diff --git a/config.c b/config.c
index cba2bcfb6722bb26ed80e8b7e5a50616cb4702e1..062449459e1a4cfc2a605c065ed281669e0e7452 100644 (file)
--- a/config.c
+++ b/config.c
@@ -471,6 +471,14 @@ int git_default_config(const char *var, const char *value)
                whitespace_rule_cfg = parse_whitespace_rule(value);
                return 0;
        }
+       if (!strcmp(var, "branch.autosetupmerge")) {
+               if (value && !strcasecmp(value, "always")) {
+                       git_branch_track = BRANCH_TRACK_ALWAYS;
+                       return 0;
+               }
+               git_branch_track = git_config_bool(var, value);
+               return 0;
+       }
 
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;