summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-14 20:44:09 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-14 20:44:09 -0700
commit2f80de956f71880b000933b1b9bff4991c5b3ca9 (patch)
tree46baf64190b08c6c609915aa24e59578d87b1e0a /merge-recursive.c
parent2de58b398b5a1f81bf74a385e41cfc2fcd9cb427 (diff)
parent8c2be75fe117f5079087a6dfb07c573cc6716143 (diff)
downloadgit-2f80de956f71880b000933b1b9bff4991c5b3ca9.tar.gz
Merge branch 'maint'
* maint: add, merge, diff: do not use strcasecmp to compare config variable names
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index ecb1806cad..07ad1a3be4 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1721,15 +1721,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;
}