mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/userdiff-config-simplify'

Browse Source 
* jk/userdiff-config-simplify:
  drop odd return value semantics from userdiff_config
This commit is contained in:
Junio C Hamano
2012-02-14 12:57:17 -08:00
parent 5f90b6fa0f 6680a0874f
commit 63d37c3062
5 changed files with 12 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diff.c
View File

@ -177,11 +177,8 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
return 0;
}
switch (userdiff_config(var, value)) {
case 0: break;
case -1: return -1;
default: return 0;
}
if (userdiff_config(var, value) < 0)
return -1;
if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
int slot = parse_diff_color_slot(var, 11);