On 12/3/2020 10:59 AM, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@xxxxxxxxx>
>
> 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@xxxxxxxxx>
> ---
> 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;
I'm not exactly sure what the value is of this line. Is it just to
make sure we have a reference to the 'static' method without actually
calling it anywhere?
"weird-looking patch" indeed! I'm more confused than anything.
Thanks,
-Stolee
