git/interdiff.c, branch main

diff: move show_interdiff() from its own file to diff-lib

2020-09-08T22:03:26Z

show_interdiff() is a relatively small function and not likely to grow larger or more complicated. Rather than dedicating an entire source file to it, relocate it to diff-lib.c which houses other "take two things and compare them" functions meant to be re-used but not so low-level as to reside in the core diff implementation. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

interdiff: teach show_interdiff() to indent interdiff

2018-07-23T19:50:06Z

A future change will allow "git format-patch --interdiff= -1" to insert an interdiff into the commentary section of the lone patch of a 1-patch series. However, to prevent the inserted interdiff from confusing git-am, as well as human readers, it needs to be indented. Therefore, teach show_interdiff() how to indent. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

format-patch: add --interdiff option to embed diff in cover letter

2018-07-23T19:50:06Z

When submitting a revised version of a patch series, it can be helpful (to reviewers) to include a summary of changes since the previous attempt in the form of an interdiff, however, doing so involves manually copy/pasting the diff into the cover letter. Add an --interdiff option to automate this process. The argument to --interdiff specifies the tip of the previous attempt against which to generate the interdiff. For example: git format-patch --cover-letter --interdiff=v1 -3 v2 The previous attempt and the patch series being formatted must share a common base. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano