add, merge, diff: do not use strcasecmp to compare config variable names
The config machinery already makes section and variable names lowercase when parsing them, so using strcasecmp for comparison just feels wasteful. No noticeable change intended. Noticed-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
May 14, 2011 at 15:19 UTC
8c2be75fe117f5079087a6dfb07c573cc6716143
3 files changed
+6
-6
builtin/add.c
+2
-2
@@ -330,8 +330,8 @@ static struct option builtin_add_options[] = {
330
331
static int add_config(const char *var, const char *value, void *cb)
332
{
333
- if (!strcasecmp(var, "add.ignoreerrors") ||
334
- !strcasecmp(var, "add.ignore-errors")) {
333
+ if (!strcmp(var, "add.ignoreerrors") ||
334
+ !strcmp(var, "add.ignore-errors")) {
335
ignore_add_errors = git_config_bool(var, value);
336
return 0;
337
}
merge-recursive.c
+3
-3
@@ -1711,15 +1711,15 @@ int merge_recursive_generic(struct merge_options *o,
1711
static int merge_recursive_config(const char *var, const char *value, void *cb)
1712
{
1713
struct merge_options *o = cb;
1714
- if (!strcasecmp(var, "merge.verbosity")) {
1714
+ if (!strcmp(var, "merge.verbosity")) {
1715
o->verbosity = git_config_int(var, value);
1716
return 0;
1717
}
1718
- if (!strcasecmp(var, "diff.renamelimit")) {
1718
+ if (!strcmp(var, "diff.renamelimit")) {
1719
o->diff_rename_limit = git_config_int(var, value);
1720
return 0;
1721
}
1722
- if (!strcasecmp(var, "merge.renamelimit")) {
1722
+ if (!strcmp(var, "merge.renamelimit")) {
1723
o->merge_rename_limit = git_config_int(var, value);
1724
return 0;
1725
}
xdiff-interface.c
+1
-1
@@ -347,7 +347,7 @@ int git_xmerge_style = -1;
347
348
int git_xmerge_config(const char *var, const char *value, void *cb)
349
{
350
- if (!strcasecmp(var, "merge.conflictstyle")) {
350
+ if (!strcmp(var, "merge.conflictstyle")) {
351
if (!value)
352
die("'%s' is not a boolean", var);
353
if (!strcmp(value, "diff3"))