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>

diff --git a/builtin/add.c b/builtin/add.c
index d39a6ab930adf2e3cd716d3e9925350befed8947..944e5a8cc9f4741c01cdca2911212d462faadcd3 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -330,8 +330,8 @@ static struct option builtin_add_options[] = {
 
 static int add_config(const char *var, const char *value, void *cb)
 {
 
 static int add_config(const char *var, const char *value, void *cb)
 {

-       if (!strcasecmp(var, "add.ignoreerrors") ||
-           !strcasecmp(var, "add.ignore-errors")) {
+       if (!strcmp(var, "add.ignoreerrors") ||
+           !strcmp(var, "add.ignore-errors")) {

                ignore_add_errors = git_config_bool(var, value);
                return 0;
        }
                ignore_add_errors = git_config_bool(var, value);
                return 0;
        }

diff --git a/merge-recursive.c b/merge-recursive.c
index af131508ec7ffa3ac7b1b1b1cadfcda0040becf2..dba27643bd30768270d5c33753d6b26dea65face 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1711,15 +1711,15 @@ int merge_recursive_generic(struct merge_options *o,
 static int merge_recursive_config(const char *var, const char *value, void *cb)
 {
        struct merge_options *o = cb;
 static int merge_recursive_config(const char *var, const char *value, void *cb)
 {
        struct merge_options *o = cb;

-       if (!strcasecmp(var, "merge.verbosity")) {
+       if (!strcmp(var, "merge.verbosity")) {

                o->verbosity = git_config_int(var, value);
                return 0;
        }
                o->verbosity = git_config_int(var, value);
                return 0;
        }

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

                o->diff_rename_limit = git_config_int(var, value);
                return 0;
        }
                o->diff_rename_limit = git_config_int(var, value);
                return 0;
        }

-       if (!strcasecmp(var, "merge.renamelimit")) {
+       if (!strcmp(var, "merge.renamelimit")) {

                o->merge_rename_limit = git_config_int(var, value);
                return 0;
        }
                o->merge_rename_limit = git_config_int(var, value);
                return 0;
        }

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 164581f87f49935f0d1b1885420960a4d11dea56..0e2c169227ad29b5bf546c6c1b97e1a1d8ed7409 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -347,7 +347,7 @@ int git_xmerge_style = -1;
 
 int git_xmerge_config(const char *var, const char *value, void *cb)
 {
 
 int git_xmerge_config(const char *var, const char *value, void *cb)
 {

-       if (!strcasecmp(var, "merge.conflictstyle")) {
+       if (!strcmp(var, "merge.conflictstyle")) {

                if (!value)
                        die("'%s' is not a boolean", var);
                if (!strcmp(value, "diff3"))
                if (!value)
                        die("'%s' is not a boolean", var);
                if (!strcmp(value, "diff3"))