diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-08-03 18:41:19 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-03 11:48:15 -0700 |
| commit | 8d552258f45ba3886e8d508ece8585b509a04677 (patch) | |
| tree | bc42b9dd566d13f8f3e1e8174bdd531b0d6c4275 /builtin/checkout.c | |
| parent | t6038: remove problematic test (diff) | |
| download | tgif-8d552258f45ba3886e8d508ece8585b509a04677.tar.xz | |
merge: make merge.renormalize work for all uses of merge machinery
The 'merge' command is not the only one that does merges; other commands
like checkout -m or rebase do as well. Unfortunately, the only area of
the code that checked for the "merge.renormalize" config setting was in
builtin/merge.c, meaning it could only affect merges performed by the
"merge" command. Move the handling of this config setting to
merge_recursive_config() so that other commands can benefit from it as
well. Fixes a few tests in t6038.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index af849c644f..18c49034c4 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -771,13 +771,6 @@ static int merge_working_tree(const struct checkout_opts *opts, */ add_files_to_cache(NULL, NULL, 0); - /* - * NEEDSWORK: carrying over local changes - * when branches have different end-of-line - * normalization (or clean+smudge rules) is - * a pain; plumb in an option to set - * o.renormalize? - */ init_merge_options(&o, the_repository); o.verbosity = 0; work = write_in_core_index_as_tree(the_repository); |