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-log.c | |
| parent | Fix processing of repo.hide and repo.ignore (diff) | |
| download | cgit-de83de276bef7509ab8255682595ad4521f3a193.tar.xz 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-log.c')
| -rw-r--r-- | ui-log.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -249,11 +249,11 @@ static void print_commit(struct commit *commit, struct rev_info *revs) static const char *disambiguate_ref(const char *ref, int *must_free_result) { - unsigned char sha1[20]; + struct object_id oid; struct strbuf longref = STRBUF_INIT; strbuf_addf(&longref, "refs/heads/%s", ref); - if (get_sha1(longref.buf, sha1) == 0) { + if (get_sha1(longref.buf, oid.hash) == 0) { *must_free_result = 1; return strbuf_detach(&longref, NULL); } |