From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Sep 2019 22:21:50 +0000 (-0700)
Subject: Merge branch 'en/merge-recursive-cleanup' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f52cb08a14fda5505611c269d6084a32bcca7db9;p=git

Merge branch 'en/merge-recursive-cleanup' into next

The merge-recursive machiery is one of the most complex parts of
the system that accumulated cruft over time.  This large series
cleans up the implementation quite a bit.

* en/merge-recursive-cleanup: (24 commits)
  merge-recursive: alphabetize include list
  merge-recursive: add sanity checks for relevant merge_options
  merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
  merge-recursive: split internal fields into a separate struct
  merge-recursive: avoid losing output and leaking memory holding that output
  merge-recursive: comment and reorder the merge_options fields
  merge-recursive: consolidate unnecessary fields in merge_options
  merge-recursive: move some definitions around to clean up the header
  merge-recursive: rename merge_options argument to opt in header
  merge-recursive: rename 'mrtree' to 'result_tree', for clarity
  merge-recursive: use common name for ancestors/common/base_list
  merge-recursive: fix some overly long lines
  cache-tree: share code between functions writing an index as a tree
  merge-recursive: don't force external callers to do our logging
  merge-recursive: remove useless parameter in merge_trees()
  merge-recursive: exit early if index != head
  Ensure index matches head before invoking merge machinery, round N
  merge-recursive: remove another implicit dependency on the_repository
  merge-recursive: future-proof update_file_flags() against memory leaks
  merge-recursive: introduce an enum for detect_directory_renames values
  ...
---

f52cb08a14fda5505611c269d6084a32bcca7db9