diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-06 08:24:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 08:24:27 +0300 |
commit | e7e456f5007f30997e48dec57a1fc09b6b0f071e (patch) | |
tree | 47ce2904980d9e233ea416e5cd05be032946c345 /builtin/describe.c | |
parent | f4c214b529336124f8642f1373cd4a549d5e7743 (diff) | |
parent | 4f01e5080c4a7eee69da47c958888358e6127584 (diff) |
Merge branch 'bc/object-id'
Conversion from uchar[20] to struct object_id continues.
* bc/object-id: (25 commits)
refs/files-backend: convert static functions to object_id
refs: convert read_raw_ref backends to struct object_id
refs: convert peel_object to struct object_id
refs: convert resolve_ref_unsafe to struct object_id
worktree: convert struct worktree to object_id
refs: convert resolve_gitlink_ref to struct object_id
Convert remaining callers of resolve_gitlink_ref to object_id
sha1_file: convert index_path and index_fd to struct object_id
refs: convert reflog_expire parameter to struct object_id
refs: convert read_ref_at to struct object_id
refs: convert peel_ref to struct object_id
builtin/pack-objects: convert to struct object_id
pack-bitmap: convert traverse_bitmap_commit_list to object_id
refs: convert dwim_log to struct object_id
builtin/reflog: convert remaining unsigned char uses to object_id
refs: convert dwim_ref and expand_ref to struct object_id
refs: convert read_ref and read_ref_full to object_id
refs: convert resolve_refdup and refs_resolve_refdup to struct object_id
Convert check_connected to use struct object_id
refs: update ref transactions to use struct object_id
...
Diffstat (limited to 'builtin/describe.c')
-rw-r--r-- | builtin/describe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 979556d9fb..e14e162ef6 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -181,7 +181,7 @@ static int get_name(const char *path, const struct object_id *oid, int flag, voi } /* Is it annotated? */ - if (!peel_ref(path, peeled.hash)) { + if (!peel_ref(path, &peeled)) { is_annotated = !!oidcmp(oid, &peeled); } else { oidcpy(&peeled, oid); |