[PATCH 6/7] merge-ort: add die-not-implemented stub handle_content_merge() function
From: Elijah Newren via GitGitGadget <hidden>
Date: 2020-12-03 16:01:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Elijah Newren <redacted> This simplistic and weird-looking patch is here to facilitate future patch submissions. Adding this stub allows rename detection code to reference it in one patch series, while a separate patch series can define the implementation, and then both series can merge cleanly and work nicely together at that point. Signed-off-by: Elijah Newren <redacted> --- merge-ort.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/merge-ort.c b/merge-ort.c
index e653ba35ea..e7220cbbb4 100644
--- a/merge-ort.c
+++ b/merge-ort.c@@ -523,6 +523,18 @@ static int collect_merge_info(struct merge_options *opt, /*** Function Grouping: functions related to threeway content merges ***/ +static int handle_content_merge(struct merge_options *opt, + const char *path, + const struct version_info *o, + const struct version_info *a, + const struct version_info *b, + const char *pathnames[3], + const int extra_marker_size, + struct version_info *result) +{ + die("Not yet implemented"); +} + /*** Function Grouping: functions related to detect_and_process_renames(), *** *** which are split into directory and regular rename detection sections. ***/
@@ -919,6 +931,8 @@ static void process_entry(struct merge_options *opt, ci->merged.clean = 0; ci->merged.result.mode = ci->stages[1].mode; oidcpy(&ci->merged.result.oid, &ci->stages[1].oid); + /* When we fix above, we'll call handle_content_merge() */ + (void)handle_content_merge; } else if (ci->filemask == 3 || ci->filemask == 5) { /* Modify/delete */ die("Not yet implemented.");
--
gitgitgadget