diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:53 -0800 |
| commit | a1f95951efc55c97477e32287b06e204553be5c2 (patch) | |
| tree | 65bda8319dd00e2e2bab2a2a4d77ca1e8f41944a /merge-ort-wrappers.h | |
| parent | Merge branch 'ds/maintenance-part-3' (diff) | |
| parent | merge,rebase,revert: select ort or recursive by config or environment (diff) | |
| download | tgif-a1f95951efc55c97477e32287b06e204553be5c2.tar.xz | |
Merge branch 'en/merge-ort-api-null-impl'
Preparation for a new merge strategy.
* en/merge-ort-api-null-impl:
merge,rebase,revert: select ort or recursive by config or environment
fast-rebase: demonstrate merge-ort's API via new test-tool command
merge-ort-wrappers: new convience wrappers to mimic the old merge API
merge-ort: barebones API of new merge strategy with empty implementation
Diffstat (limited to 'merge-ort-wrappers.h')
| -rw-r--r-- | merge-ort-wrappers.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/merge-ort-wrappers.h b/merge-ort-wrappers.h new file mode 100644 index 0000000000..0c4c57adbb --- /dev/null +++ b/merge-ort-wrappers.h @@ -0,0 +1,25 @@ +#ifndef MERGE_ORT_WRAPPERS_H +#define MERGE_ORT_WRAPPERS_H + +#include "merge-recursive.h" + +/* + * rename-detecting three-way merge, no recursion. + * Wrapper mimicking the old merge_trees() function. + */ +int merge_ort_nonrecursive(struct merge_options *opt, + struct tree *head, + struct tree *merge, + struct tree *common); + +/* + * rename-detecting three-way merge with recursive ancestor consolidation. + * Wrapper mimicking the old merge_recursive() function. + */ +int merge_ort_recursive(struct merge_options *opt, + struct commit *h1, + struct commit *h2, + struct commit_list *ancestors, + struct commit **result); + +#endif |