maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge(third_party/git): Merge squashed git subtree at v2.23.0

Browse source 
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
Vincent Ambo 2020-01-11 23:36:56 +00:00
commit 7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
third_party/git/interdiff.c vendored Normal file
View file

@ -0,0 +1,28 @@
#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);
}