diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-14 15:19:21 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-14 18:53:39 -0700 |
| commit | 8c2be75fe117f5079087a6dfb07c573cc6716143 (patch) | |
| tree | dbd90c21ea5e73685899482249c8336cdbe42a36 | |
| parent | 375f8a032e9f47d362afd5ea2443f77bcba685cb (diff) | |
| download | git-8c2be75fe117f5079087a6dfb07c573cc6716143.tar.gz | |
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>
| -rw-r--r-- | builtin/add.c | 4 | ||||
| -rw-r--r-- | merge-recursive.c | 6 | ||||
| -rw-r--r-- | xdiff-interface.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/builtin/add.c b/builtin/add.c index d39a6ab930..944e5a8cc9 100644 --- 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) { - 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; } diff --git a/merge-recursive.c b/merge-recursive.c index af131508ec..dba27643bd 100644 --- 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; - if (!strcasecmp(var, "merge.verbosity")) { + if (!strcmp(var, "merge.verbosity")) { 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; } - if (!strcasecmp(var, "merge.renamelimit")) { + if (!strcmp(var, "merge.renamelimit")) { o->merge_rename_limit = git_config_int(var, value); return 0; } diff --git a/xdiff-interface.c b/xdiff-interface.c index 164581f87f..0e2c169227 100644 --- 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) { - if (!strcasecmp(var, "merge.conflictstyle")) { + if (!strcmp(var, "merge.conflictstyle")) { if (!value) die("'%s' is not a boolean", var); if (!strcmp(value, "diff3")) |