diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-08-15 14:40:32 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-16 12:47:20 -0700 |
| commit | 139ef37a2f4daf2071debeca8b2115b4e4b0a33f (patch) | |
| tree | be14e0863d5af8089936f191fa8da46c23ca1c56 /pack-bitmap.c | |
| parent | checkout: provide better conflict hunk description with detached HEAD (diff) | |
| download | tgif-139ef37a2f4daf2071debeca8b2115b4e4b0a33f.tar.xz | |
merge-recursive: enforce opt->ancestor != NULL when calling merge_trees()
We always want our conflict hunks to be labelled so that users can know
where each came from. The previous commit fixed the one caller in the
codebase which was not setting opt->ancestor (and thus not providing a
label for the "merge base" conflict hunk in diff3-style conflict
markers); add an assertion to prevent future codepaths from also
overlooking this requirement.
Enforcing this requirement also allows us to simplify the code for
labelling the conflict hunks by no longer checking if the ancestor label
is NULL.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap.c')
0 files changed, 0 insertions, 0 deletions