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>
Tento commit je obsažen v:
Christian Hesse
2015-07-28 10:42:01 +02:00
odevzdal Jason A. Donenfeld
rodič dc41a00180
revize de83de276b
8 změnil soubory, kde provedl 15 přidání a 15 odebrání

Zobrazit soubor

@ -185,13 +185,13 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref)
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 @@ void cgit_free_reflist_inner(struct reflist *list)
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);