diff options
author | Christian Hesse | 2015-07-28 10:42:01 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2015-08-12 14:09:05 +0200 |
commit | de83de276bef7509ab8255682595ad4521f3a193 (patch) | |
tree | e40e61142c47dea3536ca88d53648e82929b6719 /ui-shared.c | |
parent | dc41a0018058c81ee9a0a2dc6e89f737d7c1c966 (diff) | |
download | cgit-de83de276bef7509ab8255682595ad4521f3a193.tar.gz cgit-de83de276bef7509ab8255682595ad4521f3a193.tar.bz2 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 'ui-shared.c')
-rw-r--r-- | ui-shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index ac5a287..e755c92 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -792,7 +792,7 @@ void cgit_add_clone_urls(void (*fn)(const char *)) | |||
792 | add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url); | 792 | add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url); |
793 | } | 793 | } |
794 | 794 | ||
795 | static int print_branch_option(const char *refname, const unsigned char *sha1, | 795 | static int print_branch_option(const char *refname, const struct object_id *oid, |
796 | int flags, void *cb_data) | 796 | int flags, void *cb_data) |
797 | { | 797 | { |
798 | char *name = (char *)refname; | 798 | char *name = (char *)refname; |