path: root/cgit.h
diff options
authorChristian Hesse <mail@eworm.de>2016-09-04 12:38:18 +0200
committerChristian Hesse <mail@eworm.de>2016-09-04 12:38:18 +0200
commit11695a58fd732689be486edf88d145578a787c89 (patch)
treeab397b8346d89a01ecc1d99350e81f1bd7cbe7a4 /cgit.h
parentFix qry.head leak on error (diff)
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 '')
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);
void cgit_diff_tree_cb(struct diff_queue_struct *q,
struct diff_options *options, void *data);
-extern int cgit_diff_files(const unsigned char *old_sha1,
- const unsigned char *new_sha1,
+extern int cgit_diff_files(const struct object_id *old_oid,
+ const struct object_id *new_oid,
unsigned long *old_size, unsigned long *new_size,
int *binary, int context, int ignorews,
linediff_fn fn);
-extern void cgit_diff_tree(const unsigned char *old_sha1,
- const unsigned char *new_sha1,
+extern void cgit_diff_tree(const struct object_id *old_oid,
+ const struct object_id *new_oid,
filepair_fn fn, const char *prefix, int ignorews);
extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,