mirror/zx2c4.cgit
1
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2025-08-30 14:39:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update git to v1.7.5.4

Browse source 
Some changes to diff options:

- no_merges has become the more general max_parents
- path restriction now uses struct pathspec

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2013-03-02 12:32:10 +00:00 • committed by Jason A. Donenfeld
parent c0a92e82da
commit bfc14d067d
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shared.c
View file

@ -307,7 +307,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
filepair_fn fn, const char *prefix, int ignorews)
{
struct diff_options opt;
int prefixlen;
struct pathspec_item item;
diff_setup(&opt);
opt.output_format = DIFF_FORMAT_CALLBACK;
@ -319,10 +319,10 @@ void cgit_diff_tree(const unsigned char *old_sha1,
opt.format_callback = cgit_diff_tree_cb;
opt.format_callback_data = fn;
if (prefix) {
opt.nr_paths = 1;
opt.paths = &prefix;
prefixlen = strlen(prefix);
opt.pathlens = &prefixlen;
item.match = prefix;
item.len = strlen(prefix);
opt.pathspec.nr = 1;
opt.pathspec.items = &item;
}
diff_setup_done(&opt);