diff.renamelimit is a basic diff configuration

The configuration was added as a core option in 3299c6f (diff: make default rename detection limit configurable., 2005-11-15), but 9ce392f (Move diff.renamelimit out of default configuration., 2005-11-21) separated diff-related stuff out of the core. Up to that point it was Ok. When we separated the Porcelain options out of the git_diff_config in 83ad63c (diff: do not use configuration magic at the core-level, 2006-07-08), we should have been more careful. This mistake made diff-tree plumbing and git-show Porcelain to notice different set of renames when the user explicitly asked for rename detection. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Linus Torvalds committed Aug 5, 2008 at 11:27 UTC 2b6ca6df2dbe9c23d0adfc1f59678a2d85c560b2

1 file changed +5 -4

diff.c

+5 -4

@@ -131,10 +131,6 @@ static int parse_funcname_pattern(const char *var, const char *ep, const char *v

131 */

132 int git_diff_ui_config(const char *var, const char *value, void *cb)

133 {

134 - if (!strcmp(var, "diff.renamelimit")) {

135 - diff_rename_limit_default = git_config_int(var, value);

136 - return 0;

137 - }

134 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {

135 diff_use_color_default = git_config_colorbool(var, value, -1);

136 return 0;

@@ -167,6 +163,11 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)

163

164 int git_diff_basic_config(const char *var, const char *value, void *cb)

165 {

166 + if (!strcmp(var, "diff.renamelimit")) {

167 + diff_rename_limit_default = git_config_int(var, value);

168 + return 0;

169 + }

170 +

171 if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {

172 int slot = parse_diff_color_slot(var, 11);

173 if (!value)