diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-05-02 20:13:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-05-02 20:13:34 +0300 |
| commit | 39273126017b287028f7d661ef455a0a0fe20880 (patch) | |
| tree | 972b7b0ef0258dc02d0aad1510b6185ffc2e0b6f /merge-ort.c | |
| parent | 4ca12e10e6fbda68adcb32e78497dc261e94734d (diff) | |
| parent | 000c4ceca794645eb4744f9c9afb6247232c0646 (diff) | |
Merge branch 'en/ort-finalize-after-0-merges-fix'
A small API fix to the ort merge strategy backend.
* en/ort-finalize-after-0-merges-fix:
merge-ort: fix calling merge_finalize() with no intermediate merge
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/merge-ort.c b/merge-ort.c index 2c6a9ed9a4..34ec2675a2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4722,14 +4722,14 @@ void merge_switch_to_result(struct merge_options *opt, void merge_finalize(struct merge_options *opt, struct merge_result *result) { - struct merge_options_internal *opti = result->priv; - if (opt->renormalize) git_attr_set_direction(GIT_ATTR_CHECKIN); assert(opt->priv == NULL); - clear_or_reinit_internal_opts(opti, 0); - FREE_AND_NULL(opti); + if (result->priv) { + clear_or_reinit_internal_opts(result->priv, 0); + FREE_AND_NULL(result->priv); + } } /*** Function Grouping: helper functions for merge_incore_*() ***/ |