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 /xdiff-interface.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 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 164581f87..0e2c16922 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")) |