crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git

@ -1 +1 @@
Subproject commit 7ed863a85a6ce2c4ac4476848310b8f917ab41f9 Subproject commit e5af0de202e885b793482d416b8ce9d50dd2b8bc

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) filepair_fn fn, const char *prefix, int ignorews)
{ {
struct diff_options opt; struct diff_options opt;
int prefixlen; struct pathspec_item item;
diff_setup(&opt); diff_setup(&opt);
opt.output_format = DIFF_FORMAT_CALLBACK; 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 = cgit_diff_tree_cb;
opt.format_callback_data = fn; opt.format_callback_data = fn;
if (prefix) { if (prefix) {
opt.nr_paths = 1; item.match = prefix;
opt.paths = &prefix; item.len = strlen(prefix);
prefixlen = strlen(prefix); opt.pathspec.nr = 1;
opt.pathlens = &prefixlen; opt.pathspec.items = &item;
} }
diff_setup_done(&opt); diff_setup_done(&opt);

2
ui-stats.c
View File

@ -239,7 +239,7 @@ struct string_list collect_stats(struct cgit_context *ctx,
init_revisions(&rev, NULL); init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV; rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT; rev.commit_format = CMIT_FMT_DEFAULT;
rev.no_merges = 1; rev.max_parents = 1;
rev.verbose_header = 1; rev.verbose_header = 1;
rev.show_root_diff = 0; rev.show_root_diff = 0;
setup_revisions(argc, argv, &rev, NULL); setup_revisions(argc, argv, &rev, NULL);