diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-17 23:50:24 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-17 23:50:25 +0300 |
commit | e1fae930193b3e8ff02cee936605625f63e1d1e4 (patch) | |
tree | 90ad9f3e50d1f1d6acd174ecb4dc0a8bbc28df27 /ref-filter.c | |
parent | 0a4ae91d1cf72b1185a46e5f072ac6b25b92350b (diff) | |
parent | e86ab2c1cd60ec4b9214e5cd8450a474fa175f5c (diff) |
Merge branch 'bc/object-id'
"uchar [40]" to "struct object_id" conversion continues.
* bc/object-id:
wt-status: convert to struct object_id
builtin/merge-base: convert to struct object_id
Convert object iteration callbacks to struct object_id
sha1_file: introduce an nth_packed_object_oid function
refs: simplify parsing of reflog entries
refs: convert each_reflog_ent_fn to struct object_id
reflog-walk: convert struct reflog_info to struct object_id
builtin/replace: convert to struct object_id
Convert remaining callers of resolve_refdup to object_id
builtin/merge: convert to struct object_id
builtin/clone: convert to struct object_id
builtin/branch: convert to struct object_id
builtin/grep: convert to struct object_id
builtin/fmt-merge-message: convert to struct object_id
builtin/fast-export: convert to struct object_id
builtin/describe: convert to struct object_id
builtin/diff-tree: convert to struct object_id
builtin/commit: convert to struct object_id
hex: introduce parse_oid_hex
Diffstat (limited to 'ref-filter.c')
-rw-r--r-- | ref-filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ref-filter.c b/ref-filter.c index 1ec0fb8391..89798dc59b 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1297,9 +1297,9 @@ static void populate_value(struct ref_array_item *ref) ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value)); if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) { - unsigned char unused1[20]; + struct object_id unused1; ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING, - unused1, NULL); + unused1.hash, NULL); if (!ref->symref) ref->symref = ""; } |