git: update to v2.5.0

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 1b605910a0362349920ad09f260fc923aed790c1..8028b27a0679f006ffae5a724d307b8e3bc73e6e 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -12,7 +12,7 @@
 #include "ui-shared.h"
 #include "argv-array.h"
 
-int files, add_lines, rem_lines;
+static int files, add_lines, rem_lines;
 
 /*
  * The list of available column colors in the commit graph.
@@ -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);
        }