2018-07-22 09:57:05 +00:00
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "interdiff.h"
|
|
|
|
|
2018-07-22 09:57:07 +00:00
|
|
|
static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data)
|
|
|
|
{
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
void show_interdiff(struct rev_info *rev, int indent)
|
2018-07-22 09:57:05 +00:00
|
|
|
{
|
|
|
|
struct diff_options opts;
|
2018-07-22 09:57:07 +00:00
|
|
|
struct strbuf prefix = STRBUF_INIT;
|
2018-07-22 09:57:05 +00:00
|
|
|
|
|
|
|
memcpy(&opts, &rev->diffopt, sizeof(opts));
|
|
|
|
opts.output_format = DIFF_FORMAT_PATCH;
|
2018-07-22 09:57:07 +00:00
|
|
|
opts.output_prefix = idiff_prefix_cb;
|
|
|
|
strbuf_addchars(&prefix, ' ', indent);
|
|
|
|
opts.output_prefix_data = &prefix;
|
2018-07-22 09:57:05 +00:00
|
|
|
diff_setup_done(&opts);
|
|
|
|
|
|
|
|
diff_tree_oid(rev->idiff_oid1, rev->idiff_oid2, "", &opts);
|
|
|
|
diffcore_std(&opts);
|
|
|
|
diff_flush(&opts);
|
2018-07-22 09:57:07 +00:00
|
|
|
|
|
|
|
strbuf_release(&prefix);
|
2018-07-22 09:57:05 +00:00
|
|
|
}
|