Skip to content

Commit 8c2be75

Browse files
jrngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 375f8a0 commit 8c2be75

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

builtin/add.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ static struct option builtin_add_options[] = {
330330

331331
static int add_config(const char *var, const char *value, void *cb)
332332
{
333-
if (!strcasecmp(var, "add.ignoreerrors") ||
334-
!strcasecmp(var, "add.ignore-errors")) {
333+
if (!strcmp(var, "add.ignoreerrors") ||
334+
!strcmp(var, "add.ignore-errors")) {
335335
ignore_add_errors = git_config_bool(var, value);
336336
return 0;
337337
}

merge-recursive.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,15 +1711,15 @@ int merge_recursive_generic(struct merge_options *o,
17111711
static int merge_recursive_config(const char *var, const char *value, void *cb)
17121712
{
17131713
struct merge_options *o = cb;
1714-
if (!strcasecmp(var, "merge.verbosity")) {
1714+
if (!strcmp(var, "merge.verbosity")) {
17151715
o->verbosity = git_config_int(var, value);
17161716
return 0;
17171717
}
1718-
if (!strcasecmp(var, "diff.renamelimit")) {
1718+
if (!strcmp(var, "diff.renamelimit")) {
17191719
o->diff_rename_limit = git_config_int(var, value);
17201720
return 0;
17211721
}
1722-
if (!strcasecmp(var, "merge.renamelimit")) {
1722+
if (!strcmp(var, "merge.renamelimit")) {
17231723
o->merge_rename_limit = git_config_int(var, value);
17241724
return 0;
17251725
}

xdiff-interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ int git_xmerge_style = -1;
347347

348348
int git_xmerge_config(const char *var, const char *value, void *cb)
349349
{
350-
if (!strcasecmp(var, "merge.conflictstyle")) {
350+
if (!strcmp(var, "merge.conflictstyle")) {
351351
if (!value)
352352
die("'%s' is not a boolean", var);
353353
if (!strcmp(value, "diff3"))

0 commit comments

Comments
 (0)