From 72a7239016fa4c8919a8b6932ad76e5f820389eb Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Tue, 8 Sep 2020 03:16:09 -0400 Subject: diff-lib: tighten show_interdiff()'s interface To compute and show an interdiff, show_interdiff() needs only the two OID's to compare and a diffopts, yet it expects callers to supply an entire rev_info. The demand for rev_info is not only overkill, but also places unnecessary burden on potential future callers which might not otherwise have a rev_info at hand. Address this by tightening its signature to require only the items it needs instead of a full rev_info. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- diff.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 308937c94b..49242d2733 100644 --- a/diff.h +++ b/diff.h @@ -600,7 +600,12 @@ int index_differs_from(struct repository *r, const char *def, const struct diff_flags *flags, int ita_invisible_in_index); -void show_interdiff(struct rev_info *, int indent); +/* + * Emit an interdiff of two object ID's to 'diff_options.file' optionally + * indented by 'indent' spaces. + */ +void show_interdiff(const struct object_id *, const struct object_id *, + int indent, struct diff_options *); /* * Fill the contents of the filespec "df", respecting any textconv defined by -- cgit v1.2.3