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 <mail@eworm.de>
---
 cgit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cgit.c')

diff --git a/cgit.c b/cgit.c
index 8c9cfb5..ed02614 100644
--- a/cgit.c
+++ b/cgit.c
@@ -421,7 +421,7 @@ struct refmatch {
 	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;
-- 
cgit v1.2.3-70-g09d2