merge-ort: add die-not-implemented stub handle_content_merge() function
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 <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Dec 3, 2020 at 15:59 UTC
e2e9dc030cb37619256ec995b05412623043e74c
1 file changed
+14
merge-ort.c
+14
@@ -550,6 +550,18 @@ static int collect_merge_info(struct merge_options *opt,
550
551
/*** Function Grouping: functions related to threeway content merges ***/
552
553
+static int handle_content_merge(struct merge_options *opt,
554
+ const char *path,
555
+ const struct version_info *o,
556
+ const struct version_info *a,
557
+ const struct version_info *b,
558
+ const char *pathnames[3],
559
+ const int extra_marker_size,
560
+ struct version_info *result)
561
+{
562
+ die("Not yet implemented");
563
+}
564
+
565
/*** Function Grouping: functions related to detect_and_process_renames(), ***
566
*** which are split into directory and regular rename detection sections. ***/
567
@@ -957,6 +969,8 @@ static void process_entry(struct merge_options *opt,
969
ci->merged.clean = 0;
970
ci->merged.result.mode = ci->stages[1].mode;
971
oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
972
+ /* When we fix above, we'll call handle_content_merge() */
973
+ (void)handle_content_merge;
974
} else if (ci->filemask == 3 || ci->filemask == 5) {
975
/* Modify/delete */
976
die("Not yet implemented.");