about summary refs log tree commit diff stats
path: root/shared.c
diff options
context:
space:
mode:
authorChristian Hesse2015-07-28 10:42:01 +0200
committerJason A. Donenfeld2015-08-12 14:09:05 +0200
commitde83de276bef7509ab8255682595ad4521f3a193 (patch)
treee40e61142c47dea3536ca88d53648e82929b6719 /shared.c
parentFix processing of repo.hide and repo.ignore (diff)
downloadcgit-de83de276bef7509ab8255682595ad4521f3a193.tar.gz
cgit-de83de276bef7509ab8255682595ad4521f3a193.zip
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>
Diffstat (limited to 'shared.c')
-rw-r--r--shared.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shared.c b/shared.c index a99173b..a83afcb 100644 --- a/shared.c +++ b/shared.c
@@ -185,13 +185,13 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref)
185 list->refs[list->count++] = ref; 185 list->refs[list->count++] = ref;
186} 186}
187 187
188static struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) 188static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_id *oid)
189{ 189{
190 struct refinfo *ref; 190 struct refinfo *ref;
191 191
192 ref = xmalloc(sizeof (struct refinfo)); 192 ref = xmalloc(sizeof (struct refinfo));
193 ref->refname = xstrdup(refname); 193 ref->refname = xstrdup(refname);
194 ref->object = parse_object(sha1); 194 ref->object = parse_object(oid->hash);
195 switch (ref->object->type) { 195 switch (ref->object->type) {
196 case OBJ_TAG: 196 case OBJ_TAG:
197 ref->tag = cgit_parse_tag((struct tag *)ref->object); 197 ref->tag = cgit_parse_tag((struct tag *)ref->object);
@@ -239,11 +239,11 @@ void cgit_free_reflist_inner(struct reflist *list)
239 free(list->refs); 239 free(list->refs);
240} 240}
241 241
242int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, 242int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags,
243 void *cb_data) 243 void *cb_data)
244{ 244{
245 struct reflist *list = (struct reflist *)cb_data; 245 struct reflist *list = (struct reflist *)cb_data;
246 struct refinfo *info = cgit_mk_refinfo(refname, sha1); 246 struct refinfo *info = cgit_mk_refinfo(refname, oid);
247 247
248 if (info) 248 if (info)
249 cgit_add_ref(list, info); 249 cgit_add_ref(list, info);