aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.h
diff options
context:
space:
mode:
authorChristian Hesse2016-09-04 12:38:18 +0200
committerChristian Hesse2016-09-04 12:38:18 +0200
commit11695a58fd732689be486edf88d145578a787c89 (patch)
treeab397b8346d89a01ecc1d99350e81f1bd7cbe7a4 /cgit.h
parentff9893ac8192579a00dd4c73ddff18ab232099a6 (diff)
downloadcgit-11695a58fd732689be486edf88d145578a787c89.tar.gz
cgit-11695a58fd732689be486edf88d145578a787c89.tar.bz2
cgit-11695a58fd732689be486edf88d145578a787c89.zip
git: update to v2.10.0
Upstream continues to replace unsigned char *sha1 with struct object_id old_oid. This makes the required changes. The git lib has its own main function now. Rename our main function to cmd_main, it is called from main then.
Diffstat (limited to 'cgit.h')
-rw-r--r--cgit.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cgit.h b/cgit.h
index 325432b..f34395c 100644
--- a/cgit.h
+++ b/cgit.h
@@ -348,14 +348,14 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
348void cgit_diff_tree_cb(struct diff_queue_struct *q, 348void cgit_diff_tree_cb(struct diff_queue_struct *q,
349 struct diff_options *options, void *data); 349 struct diff_options *options, void *data);
350 350
351extern int cgit_diff_files(const unsigned char *old_sha1, 351extern int cgit_diff_files(const struct object_id *old_oid,
352 const unsigned char *new_sha1, 352 const struct object_id *new_oid,
353 unsigned long *old_size, unsigned long *new_size, 353 unsigned long *old_size, unsigned long *new_size,
354 int *binary, int context, int ignorews, 354 int *binary, int context, int ignorews,
355 linediff_fn fn); 355 linediff_fn fn);
356 356
357extern void cgit_diff_tree(const unsigned char *old_sha1, 357extern void cgit_diff_tree(const struct object_id *old_oid,
358 const unsigned char *new_sha1, 358 const struct object_id *new_oid,
359 filepair_fn fn, const char *prefix, int ignorews); 359 filepair_fn fn, const char *prefix, int ignorews);
360 360
361extern void cgit_diff_commit(struct commit *commit, filepair_fn fn, 361extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,