diff options
| author | John Keeping <john@keeping.me.uk> | 2013-03-02 12:32:10 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-03-02 10:38:03 -0500 |
| commit | bfc14d067da0fdf65f306fcd9a65829d9694dbeb (patch) | |
| tree | 71097af45a55844f67f4af411d461903f5d60519 /shared.c | |
| parent | Print submodule revision next to submodule link (diff) | |
| download | cgit-pink-bfc14d067da0fdf65f306fcd9a65829d9694dbeb.tar.gz cgit-pink-bfc14d067da0fdf65f306fcd9a65829d9694dbeb.zip | |
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>
Diffstat (limited to 'shared.c')
| -rw-r--r-- | shared.c | 10 |
1 files changed, 5 insertions, 5 deletions
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, 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); |