about summary refs log tree commit diff
path: root/ui-diff.h
diff options
context:
space:
mode:
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 /ui-diff.h
parentFix qry.head leak on error (diff)
downloadcgit-pink-11695a58fd732689be486edf88d145578a787c89.tar.gz
cgit-pink-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 '')
-rw-r--r--ui-diff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-diff.h b/ui-diff.h
index 382e8c5..39264a1 100644
--- a/ui-diff.h
+++ b/ui-diff.h
@@ -9,7 +9,7 @@ extern void cgit_print_diff(const char *new_hex, const char *old_hex,
 extern struct diff_filespec *cgit_get_current_old_file(void);
 extern struct diff_filespec *cgit_get_current_new_file(void);
 
-extern unsigned char old_rev_sha1[20];
-extern unsigned char new_rev_sha1[20];
+extern struct object_id old_rev_oid[1];
+extern struct object_id new_rev_oid[1];
 
 #endif /* UI_DIFF_H */