all repos — cgit @ bfc14d067da0fdf65f306fcd9a65829d9694dbeb

a hyperfast web frontend for git written in c 

Update git to v1.7.5.4

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>
John Keeping john@keeping.me.uk
Sat, 02 Mar 2013 12:32:10 +0000
commit

bfc14d067da0fdf65f306fcd9a65829d9694dbeb

parent

c0a92e82da3063efc230538ba109ff95aa59589a

2 files changed, 6 insertions(+), 6 deletions(-)

jump to
M shared.c → shared.c 
@@ -307,7 +307,7 @@ const unsigned char *new_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 @@ DIFF_XDL_SET(&opt, IGNORE_WHITESPACE);
 	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);
M ui-stats.c → ui-stats.c 
@@ -239,7 +239,7 @@ }
 	init_revisions(&rev, NULL);
 	rev.abbrev = DEFAULT_ABBREV;
 	rev.commit_format = CMIT_FMT_DEFAULT;
-	rev.no_merges = 1;
+	rev.max_parents = 1;
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(argc, argv, &rev, NULL);