diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-14 20:44:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-14 20:44:09 -0700 |
| commit | 2f80de956f71880b000933b1b9bff4991c5b3ca9 (patch) | |
| tree | 46baf64190b08c6c609915aa24e59578d87b1e0a | |
| parent | 2de58b398b5a1f81bf74a385e41cfc2fcd9cb427 (diff) | |
| parent | 8c2be75fe117f5079087a6dfb07c573cc6716143 (diff) | |
| download | git-2f80de956f71880b000933b1b9bff4991c5b3ca9.tar.gz git-2f80de956f71880b000933b1b9bff4991c5b3ca9.tar.xz | |
Merge branch 'maint'
* maint:
add, merge, diff: do not use strcasecmp to compare config variable names
| -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 704141fdd..e57abddf5 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -331,8 +331,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 ecb1806ca..07ad1a3be 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; } 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")) |