зеркало из https://github.com/microsoft/git.git
diff.renamelimit is a basic diff configuration
The configuration was added as a core option in3299c6f
(diff: make default rename detection limit configurable., 2005-11-15), but9ce392f
(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 in83ad63c
(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>
This commit is contained in:
Родитель
3be3999849
Коммит
2b6ca6df2d
9
diff.c
9
diff.c
|
@ -131,10 +131,6 @@ static int parse_funcname_pattern(const char *var, const char *ep, const char *v
|
|||
*/
|
||||
int git_diff_ui_config(const char *var, const char *value, void *cb)
|
||||
{
|
||||
if (!strcmp(var, "diff.renamelimit")) {
|
||||
diff_rename_limit_default = git_config_int(var, value);
|
||||
return 0;
|
||||
}
|
||||
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
|
||||
diff_use_color_default = git_config_colorbool(var, value, -1);
|
||||
return 0;
|
||||
|
@ -167,6 +163,11 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
|
|||
|
||||
int git_diff_basic_config(const char *var, const char *value, void *cb)
|
||||
{
|
||||
if (!strcmp(var, "diff.renamelimit")) {
|
||||
diff_rename_limit_default = git_config_int(var, value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
|
||||
int slot = parse_diff_color_slot(var, 11);
|
||||
if (!value)
|
||||
|
|
Загрузка…
Ссылка в новой задаче