cgit

diff --git a/Makefile b/Makefile
index 1f84c00b46d59a5bef7153d0d92a3edc13d79ef1..65b43181df3f13a309a1e104bce860e2e9f00492 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.4.1
+GIT_VER = 2.5.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r




diff --git a/cgit.c b/cgit.c
index 8c9cfb5e87ad9343f21b6cc0b032575969e4b914..ed026142a4fce1f9c9f6d94a094a21ec8f9ae87d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -421,7 +421,7 @@ 	char *first_ref;
 	int match;
 };
 
-static int find_current_ref(const char *refname, const unsigned char *sha1,
+static int find_current_ref(const char *refname, const struct object_id *oid,
 			    int flags, void *cb_data)
 {
 	struct refmatch *info;




diff --git a/cgit.h b/cgit.h
index 16f809297fc40d9eedf95a80fcaf7e4caaefb26f..db9a8ebefa76d820a94668334da5936b439fea77 100644
--- a/cgit.h
+++ b/cgit.h
@@ -335,7 +335,7 @@ extern void strbuf_ensure_end(struct strbuf *sb, char c);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern void cgit_free_reflist_inner(struct reflist *list);
-extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
+extern int cgit_refs_cb(const char *refname, const struct object_id *oid,
 			int flags, void *cb_data);
 
 extern void *cgit_free_commitinfo(struct commitinfo *info);








diff --git a/shared.c b/shared.c
index a99173b6113c058cef503e76042a575d1bdbf127..a83afcb3e275bed29d41ec779bf019ddde7589c5 100644
--- a/shared.c
+++ b/shared.c
@@ -185,13 +185,13 @@ 	}
 	list->refs[list->count++] = ref;
 }
 
-static struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
+static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_id *oid)
 {
 	struct refinfo *ref;
 
 	ref = xmalloc(sizeof (struct refinfo));
 	ref->refname = xstrdup(refname);
-	ref->object = parse_object(sha1);
+	ref->object = parse_object(oid->hash);
 	switch (ref->object->type) {
 	case OBJ_TAG:
 		ref->tag = cgit_parse_tag((struct tag *)ref->object);
@@ -239,11 +239,11 @@ 	}
 	free(list->refs);
 }
 
-int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
+int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags,
 		  void *cb_data)
 {
 	struct reflist *list = (struct reflist *)cb_data;
-	struct refinfo *info = cgit_mk_refinfo(refname, sha1);
+	struct refinfo *info = cgit_mk_refinfo(refname, oid);
 
 	if (info)
 		cgit_add_ref(list, info);




diff --git a/ui-clone.c b/ui-clone.c
index e35d3d310e1434852a956718d75eecd2e0059265..e4ddd34932f8182033267d2a439f6b76950a730f 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -12,15 +12,15 @@ #include "ui-clone.h"
 #include "html.h"
 #include "ui-shared.h"
 
-static int print_ref_info(const char *refname, const unsigned char *sha1,
+static int print_ref_info(const char *refname, const struct object_id *oid,
                           int flags, void *cb_data)
 {
 	struct object *obj;
 
-	if (!(obj = parse_object(sha1)))
+	if (!(obj = parse_object(oid->hash)))
 		return 0;
 
-	htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
+	htmlf("%s\t%s\n", oid_to_hex(oid), refname);
 	if (obj->type == OBJ_TAG) {
 		if (!(obj = deref_tag(obj, refname, 0)))
 			return 0;
@@ -50,7 +50,7 @@ 		}
 	}
 }
 
-static void send_file(char *path)
+static void send_file(const char *path)
 {
 	struct stat st;
 




diff --git a/ui-log.c b/ui-log.c
index 32b4c4734d0cc26b457fc45c26d0fd8f31089e62..8028b27a0679f006ffae5a724d307b8e3bc73e6e 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -249,11 +249,11 @@ }
 
 static const char *disambiguate_ref(const char *ref, int *must_free_result)
 {
-	unsigned char sha1[20];
+	struct object_id oid;
 	struct strbuf longref = STRBUF_INIT;
 
 	strbuf_addf(&longref, "refs/heads/%s", ref);
-	if (get_sha1(longref.buf, sha1) == 0) {
+	if (get_sha1(longref.buf, oid.hash) == 0) {
 		*must_free_result = 1;
 		return strbuf_detach(&longref, NULL);
 	}




diff --git a/ui-shared.c b/ui-shared.c
index ac5a2871e3625fb3c4d6a5e1f30cb1bb65561022..e755c92d79878a292f165cfcad23d66c6a6d8bcc 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -792,7 +792,7 @@ 	else if (ctx.cfg.clone_prefix)
 		add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
 }
 
-static int print_branch_option(const char *refname, const unsigned char *sha1,
+static int print_branch_option(const char *refname, const struct object_id *oid,
 			       int flags, void *cb_data)
 {
 	char *name = (char *)refname;