diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2020-09-08 03:16:08 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-08 15:03:26 -0700 |
| commit | cdffbdc217aba8a39d786a642d1376a5a605adec (patch) | |
| tree | 212d466731fac04ad80903848f647a52d9a3bf04 /interdiff.c | |
| parent | 3a238e539bcdfe3f9eb5010fd218640c1b499f7a (diff) | |
| download | git-cdffbdc217aba8a39d786a642d1376a5a605adec.tar.gz | |
diff: move show_interdiff() from its own file to diff-lib
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 <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'interdiff.c')
| -rw-r--r-- | interdiff.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/interdiff.c b/interdiff.c deleted file mode 100644 index c81d680a6c..0000000000 --- a/interdiff.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "cache.h" -#include "commit.h" -#include "revision.h" -#include "interdiff.h" - -static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data) -{ - return data; -} - -void show_interdiff(struct rev_info *rev, int indent) -{ - struct diff_options opts; - struct strbuf prefix = STRBUF_INIT; - - memcpy(&opts, &rev->diffopt, sizeof(opts)); - opts.output_format = DIFF_FORMAT_PATCH; - opts.output_prefix = idiff_prefix_cb; - strbuf_addchars(&prefix, ' ', indent); - opts.output_prefix_data = &prefix; - diff_setup_done(&opts); - - diff_tree_oid(rev->idiff_oid1, rev->idiff_oid2, "", &opts); - diffcore_std(&opts); - diff_flush(&opts); - - strbuf_release(&prefix); -} |