about summary refs log tree commit diff stats
diff options
context:
space:
mode:
m---------git0
-rw-r--r--shared.c10
-rw-r--r--ui-stats.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/git b/git
Subproject 7ed863a85a6ce2c4ac4476848310b8f917ab41f Subproject e5af0de202e885b793482d416b8ce9d50dd2b8b
diff --git a/shared.c b/shared.c index 8e5ae48..0967f92 100644 --- a/shared.c +++ b/shared.c
@@ -307,7 +307,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
307 filepair_fn fn, const char *prefix, int ignorews) 307 filepair_fn fn, const char *prefix, int ignorews)
308{ 308{
309 struct diff_options opt; 309 struct diff_options opt;
310 int prefixlen; 310 struct pathspec_item item;
311 311
312 diff_setup(&opt); 312 diff_setup(&opt);
313 opt.output_format = DIFF_FORMAT_CALLBACK; 313 opt.output_format = DIFF_FORMAT_CALLBACK;
@@ -319,10 +319,10 @@ void cgit_diff_tree(const unsigned char *old_sha1,
319 opt.format_callback = cgit_diff_tree_cb; 319 opt.format_callback = cgit_diff_tree_cb;
320 opt.format_callback_data = fn; 320 opt.format_callback_data = fn;
321 if (prefix) { 321 if (prefix) {
322 opt.nr_paths = 1; 322 item.match = prefix;
323 opt.paths = &prefix; 323 item.len = strlen(prefix);
324 prefixlen = strlen(prefix); 324 opt.pathspec.nr = 1;
325 opt.pathlens = &prefixlen; 325 opt.pathspec.items = &item;
326 } 326 }
327 diff_setup_done(&opt); 327 diff_setup_done(&opt);
328 328
diff --git a/ui-stats.c b/ui-stats.c index 59f4c1e..51dd6a2 100644 --- a/ui-stats.c +++ b/ui-stats.c
@@ -239,7 +239,7 @@ struct string_list collect_stats(struct cgit_context *ctx,
239 init_revisions(&rev, NULL); 239 init_revisions(&rev, NULL);
240 rev.abbrev = DEFAULT_ABBREV; 240 rev.abbrev = DEFAULT_ABBREV;
241 rev.commit_format = CMIT_FMT_DEFAULT; 241 rev.commit_format = CMIT_FMT_DEFAULT;
242 rev.no_merges = 1; 242 rev.max_parents = 1;
243 rev.verbose_header = 1; 243 rev.verbose_header = 1;
244 rev.show_root_diff = 0; 244 rev.show_root_diff = 0;
245 setup_revisions(argc, argv, &rev, NULL); 245 setup_revisions(argc, argv, &rev, NULL);