diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-30 23:06:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 23:06:01 (GMT) |
| commit | 8778fa8b4f18a3930101825e5bcff62b5348e918 (patch) | |
| tree | 309f07c553653f8f1c2c84b5b506ed47ee48a494 /sequencer.c | |
| parent | aca13c2355e7188432cb32aedf0bb0c477ec011a (diff) | |
| parent | f5a3c5e6377b806c320e4220ba26e467b4c4e992 (diff) | |
| download | git-8778fa8b4f18a3930101825e5bcff62b5348e918.zip git-8778fa8b4f18a3930101825e5bcff62b5348e918.tar.gz git-8778fa8b4f18a3930101825e5bcff62b5348e918.tar.bz2 | |
Merge branch 'en/ort-becomes-the-default'
Use `ort` instead of `recursive` as the default merge strategy.
* en/ort-becomes-the-default:
Update docs for change of default merge backend
Change default merge backend from recursive to ort
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 7407913..1ceb4c0 100644 --- a/sequencer.c +++ b/sequencer.c @@ -636,7 +636,7 @@ static int do_recursive_merge(struct repository *r, for (i = 0; i < opts->xopts_nr; i++) parse_merge_opt(&o, opts->xopts[i]); - if (opts->strategy && !strcmp(opts->strategy, "ort")) { + if (!opts->strategy || !strcmp(opts->strategy, "ort")) { memset(&result, 0, sizeof(result)); merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree, &result); @@ -3988,7 +3988,7 @@ static int do_merge(struct repository *r, o.branch2 = ref_name.buf; o.buffer_output = 2; - if (opts->strategy && !strcmp(opts->strategy, "ort")) { + if (!opts->strategy || !strcmp(opts->strategy, "ort")) { /* * TODO: Should use merge_incore_recursive() and * merge_switch_to_result(), skipping the call to |