diff options
| author | Elijah Newren <newren@gmail.com> | 2020-12-03 15:59:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-13 22:38:47 (GMT) |
| commit | e2e9dc030cb37619256ec995b05412623043e74c (patch) | |
| tree | a532a36c4ee668d37beabf4791841e671e71a475 /merge-ort.c | |
| parent | 04af1879b9313a83aea46791bad8963e14e7651e (diff) | |
| download | git-e2e9dc030cb37619256ec995b05412623043e74c.zip git-e2e9dc030cb37619256ec995b05412623043e74c.tar.gz git-e2e9dc030cb37619256ec995b05412623043e74c.tar.bz2 | |
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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index 8a144fb..e6b763d 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -550,6 +550,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. ***/ @@ -957,6 +969,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."); |