summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:39:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-25 19:19:39 (GMT)
commit4e675d17320ab98a946cef906f37938972a44be2 (patch)
tree7d717fa197e120b36a620f04f609e8d39c5035db
parent0a0c9532170e6f2fec1a89aa4dff94c74d2d11d7 (diff)
downloadgit-4e675d17320ab98a946cef906f37938972a44be2.zip
git-4e675d17320ab98a946cef906f37938972a44be2.tar.gz
git-4e675d17320ab98a946cef906f37938972a44be2.tar.bz2
warn_if_dangling_symref(): convert local variable "junk" to object_id
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>
-rw-r--r--refs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/refs.c b/refs.c
index 162760c..7515c2e 100644
--- 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)