summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-05 21:21:08 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-05 21:21:08 -0700
commit04bb50f45dda9aeb755e943cbc9df264cfc8cbc5 (patch)
treea863b7f6bcfee344db722621d08bdc1ddbbacc6f /diff.c
parentfba5279db904aa49bb75bb31614571b9b6d75b33 (diff)
parent2d0f5f3459278475602394a7165bf8919412f4e4 (diff)
downloadgit-04bb50f45dda9aeb755e943cbc9df264cfc8cbc5.tar.gz
Merge branch 'maint'
* maint: RelNotes 1.5.6.5 updates diff.renamelimit is a basic diff configuration git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout. Documentation: typos / spelling fixes in older RelNotes
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/diff.c b/diff.c
index bd04fdfd28..8746c60b9c 100644
--- a/diff.c
+++ b/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)