Staging
v0.5.1
https://github.com/git/git
Revision b4374e96c84ed9394fed363973eb540da308ed4f authored by Junio C Hamano on 09 March 2020, 18:20:59 UTC, committed by Junio C Hamano on 09 March 2020, 18:21:21 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 4a5c3e1
Raw File
Tip revision: b4374e96c84ed9394fed363973eb540da308ed4f authored by Junio C Hamano on 09 March 2020, 18:20:59 UTC
Git 2.26-rc1
Tip revision: b4374e9
interdiff.c
#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);
}
back to top