diff options
author | Christian Hesse <mail@eworm.de> | 2015-07-28 10:42:01 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2015-08-12 14:09:05 +0200 |
commit | de83de276bef7509ab8255682595ad4521f3a193 (patch) | |
tree | e40e61142c47dea3536ca88d53648e82929b6719 /ui-clone.c | |
parent | dc41a0018058c81ee9a0a2dc6e89f737d7c1c966 (diff) |
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 'ui-clone.c')
-rw-r--r-- | ui-clone.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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; |