diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-17 13:50:25 -0700 |
commit | e1fae930193b3e8ff02cee936605625f63e1d1e4 (patch) | |
tree | 90ad9f3e50d1f1d6acd174ecb4dc0a8bbc28df27 /transport.c | |
parent | 0a4ae91d1cf72b1185a46e5f072ac6b25b92350b (diff) | |
parent | e86ab2c1cd60ec4b9214e5cd8450a474fa175f5c (diff) | |
download | git-e1fae930193b3e8ff02cee936605625f63e1d1e4.tar.gz |
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 'transport.c')
-rw-r--r-- | transport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/transport.c b/transport.c index ea1feac9dc..417ed7f19f 100644 --- a/transport.c +++ b/transport.c @@ -471,11 +471,11 @@ void transport_print_push_status(const char *dest, struct ref *refs, { struct ref *ref; int n = 0; - unsigned char head_sha1[20]; + struct object_id head_oid; char *head; int summary_width = transport_summary_width(refs); - head = resolve_refdup("HEAD", RESOLVE_REF_READING, head_sha1, NULL); + head = resolve_refdup("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL); if (verbose) { for (ref = refs; ref; ref = ref->next) |