Skip to content

Commit

Permalink
warn_if_dangling_symref(): convert local variable "junk" to object_id
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed May 25, 2015
1 parent 0a0c953 commit 4e675d1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 4e675d1

Please sign in to comment.