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 /merge-recursive.c | |
| parent | 375f8a032e9f47d362afd5ea2443f77bcba685cb (diff) | |
| download | git-8c2be75fe117f5079087a6dfb07c573cc6716143.tar.gz git-8c2be75fe117f5079087a6dfb07c573cc6716143.tar.xz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index af131508e..dba27643b 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; } |