From de83de276bef7509ab8255682595ad4521f3a193 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 28 Jul 2015 10:42:01 +0200 Subject: git: update to v2.5.0 Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse --- ui-clone.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ui-clone.c') diff --git a/ui-clone.c b/ui-clone.c index e35d3d3..e4ddd34 100644 --- a/ui-clone.c +++ b/ui-clone.c @@ -12,15 +12,15 @@ #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 print_pack_info(void) } } -static void send_file(char *path) +static void send_file(const char *path) { struct stat st; -- cgit v1.2.3-70-g09d2