]> granicus.if.org Git - git/commitdiff
warn_if_dangling_symref(): convert local variable "junk" to object_id
authorMichael Haggerty <mhagger@alum.mit.edu>
Mon, 25 May 2015 18:39:21 +0000 (18:39 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 May 2015 19:19:39 +0000 (12:19 -0700)
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
refs.c

diff --git a/refs.c b/refs.c
index 162760c0875d3c07887b2e0ce756b2dd0eb6c160..7515c2e9260ad66368c45569b9bfb3c63d212faa 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1757,7 +1757,7 @@ int ref_exists(const char *refname)
 }
 
 static int filter_refs(const char *refname, const struct object_id *oid,
-                      int flags, void *data)
+                          int flags, void *data)
 {
        struct ref_filter *filter = (struct ref_filter *)data;
 
@@ -1903,12 +1903,12 @@ static int warn_if_dangling_symref(const char *refname, const struct object_id *
 {
        struct warn_if_dangling_data *d = cb_data;
        const char *resolves_to;
-       unsigned char junk[20];
+       struct object_id junk;
 
        if (!(flags & REF_ISSYMREF))
                return 0;
 
-       resolves_to = resolve_ref_unsafe(refname, 0, junk, NULL);
+       resolves_to = resolve_ref_unsafe(refname, 0, junk.hash, NULL);
        if (!resolves_to
            || (d->refname
                ? strcmp(resolves_to, d->refname)