diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 16:23:47 (GMT) |
| commit | 1776979573fa150cfad850f73ab4109d245ad210 (patch) | |
| tree | ec9c5dd5c62a303f7c236412b78dbbe07a9dac2a /ref-filter.c | |
| parent | df46d77e00e7bbcfe46cc06c071fa5284f96c327 (diff) | |
| download | git-1776979573fa150cfad850f73ab4109d245ad210.zip git-1776979573fa150cfad850f73ab4109d245ad210.tar.gz git-1776979573fa150cfad850f73ab4109d245ad210.tar.bz2 | |
ref-filter: convert grab_objectname to struct object_id
This is necessary in order to convert find_unique_abbrev.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ref-filter.c b/ref-filter.c index 45fc562..dbe554d 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -737,18 +737,18 @@ static void *get_obj(const struct object_id *oid, struct object **obj, unsigned return buf; } -static int grab_objectname(const char *name, const unsigned char *sha1, +static int grab_objectname(const char *name, const struct object_id *oid, struct atom_value *v, struct used_atom *atom) { if (starts_with(name, "objectname")) { if (atom->u.objectname.option == O_SHORT) { - v->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); + v->s = xstrdup(find_unique_abbrev(oid->hash, DEFAULT_ABBREV)); return 1; } else if (atom->u.objectname.option == O_FULL) { - v->s = xstrdup(sha1_to_hex(sha1)); + v->s = xstrdup(oid_to_hex(oid)); return 1; } else if (atom->u.objectname.option == O_LENGTH) { - v->s = xstrdup(find_unique_abbrev(sha1, atom->u.objectname.length)); + v->s = xstrdup(find_unique_abbrev(oid->hash, atom->u.objectname.length)); return 1; } else die("BUG: unknown %%(objectname) option"); @@ -775,7 +775,7 @@ static void grab_common_values(struct atom_value *val, int deref, struct object v->s = xstrfmt("%lu", sz); } else if (deref) - grab_objectname(name, obj->oid.hash, v, &used_atom[i]); + grab_objectname(name, &obj->oid, v, &used_atom[i]); } } @@ -1455,7 +1455,7 @@ static void populate_value(struct ref_array_item *ref) v->s = xstrdup(buf + 1); } continue; - } else if (!deref && grab_objectname(name, ref->objectname.hash, v, atom)) { + } else if (!deref && grab_objectname(name, &ref->objectname, v, atom)) { continue; } else if (!strcmp(name, "HEAD")) { if (atom->u.head && !strcmp(ref->refname, atom->u.head)) |