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 /cgit.c | |
| parent | Fix processing of repo.hide and repo.ignore (diff) | |
| download | cgit-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 'cgit.c')
| -rw-r--r-- | cgit.c | 2 |
1 files changed, 1 insertions, 1 deletions
| diff --git a/cgit.c b/cgit.c index 8c9cfb5..ed02614 100644 --- a/cgit.c +++ b/cgit.c | |||
| @@ -421,7 +421,7 @@ struct refmatch { | |||
| 421 | int match; | 421 | int match; |
| 422 | }; | 422 | }; |
| 423 | 423 | ||
| 424 | static int find_current_ref(const char *refname, const unsigned char *sha1, | 424 | static int find_current_ref(const char *refname, const struct object_id *oid, |
| 425 | int flags, void *cb_data) | 425 | int flags, void *cb_data) |
| 426 | { | 426 | { |
| 427 | struct refmatch *info; | 427 | struct refmatch *info; |