@@ -30,6 +30,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
repo_init_revisions(the_repository, &rev, prefix);
rev.abbrev = 0;
rev.diffopt.stat_width = -1; /* use full terminal width */
+ rev.diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
/*
* Consider "intent-to-add" files as new by default, unless
@@ -27,6 +27,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
repo_init_revisions(the_repository, &rev, prefix);
rev.abbrev = 0;
rev.diffopt.stat_width = -1; /* use full terminal width */
+ rev.diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
prefix = precompose_argv_prefix(argc, argv, prefix);
/*
@@ -123,6 +123,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
opt->abbrev = 0;
opt->diff = 1;
opt->diffopt.stat_width = -1; /* use full terminal width */
+ opt->diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
opt->disable_stdin = 1;
memset(&s_r_opt, 0, sizeof(s_r_opt));
s_r_opt.tweak = diff_tree_tweak_rev;
@@ -394,10 +394,6 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
diff_relative = git_config_bool(var, value);
return 0;
}
- if (!strcmp(var, "diff.statgraphwidth")) {
- diff_stat_graph_width = git_config_int(var, value);
- return 0;
- }
if (!strcmp(var, "diff.external"))
return git_config_string(&external_diff_cmd_cfg, var, value);
if (!strcmp(var, "diff.wordregex"))
@@ -477,6 +473,11 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
return 0;
}
+ if (!strcmp(var, "diff.statgraphwidth")) {
+ diff_stat_graph_width = git_config_int(var, value);
+ return 0;
+ }
+
if (git_diff_heuristic_config(var, value, cb) < 0)
return -1;