summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-10 17:24:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-08-10 17:24:02 (GMT)
commit4339259d5fa45160fb75d17052038ba96fb3664a (patch)
tree909334fc232f06ddbfe126bbda5cf00f0e673dc3 /merge-recursive.c
parent1aa3dff4ba492483a4cce0a3aa315cfc05b0bdd3 (diff)
parent00906d6f227b259ac7c8cebd07bbea0ba4792185 (diff)
downloadgit-4339259d5fa45160fb75d17052038ba96fb3664a.zip
git-4339259d5fa45160fb75d17052038ba96fb3664a.tar.gz
git-4339259d5fa45160fb75d17052038ba96fb3664a.tar.bz2
Merge branch 'en/eol-attrs-gotchas'
All "mergy" operations that internally use the merge-recursive machinery should honor the merge.renormalize configuration, but many of them didn't. * en/eol-attrs-gotchas: checkout: support renormalization with checkout -m <paths> merge: make merge.renormalize work for all uses of merge machinery t6038: remove problematic test t6038: make tests fail for the right reason
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 01c633d..d021433 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3792,9 +3792,12 @@ int merge_recursive_generic(struct merge_options *opt,
static void merge_recursive_config(struct merge_options *opt)
{
char *value = NULL;
+ int renormalize = 0;
git_config_get_int("merge.verbosity", &opt->verbosity);
git_config_get_int("diff.renamelimit", &opt->rename_limit);
git_config_get_int("merge.renamelimit", &opt->rename_limit);
+ git_config_get_bool("merge.renormalize", &renormalize);
+ opt->renormalize = renormalize;
if (!git_config_get_string("diff.renames", &value)) {
opt->detect_renames = git_config_rename("diff.renames", value);
free(value);