diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-10 12:36:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-10 12:36:13 -0800 |
| commit | 844a9ce47208de173341525c15a4c8c689dd278e (patch) | |
| tree | d771915b28609179ddf1f3f911bcb30b7019d7cf /builtin/receive-pack.c | |
| parent | b12a966eff3f66337f83c117dbab8fa0cca16e4b (diff) | |
| parent | fcd30b138759a2ab5ecb55758c3341f0d608df2b (diff) | |
| download | git-844a9ce47208de173341525c15a4c8c689dd278e.tar.gz git-844a9ce47208de173341525c15a4c8c689dd278e.tar.xz | |
Merge branch 'bc/object-id'
More transition from "unsigned char[40]" to "struct object_id".
This needed a few merge fixups, but is mostly disentangled from other
topics.
* bc/object-id:
remote: convert functions to struct object_id
Remove get_object_hash.
Convert struct object to object_id
Add several uses of get_object_hash.
object: introduce get_object_hash macro.
ref_newer: convert to use struct object_id
push_refs_with_export: convert to struct object_id
get_remote_heads: convert to struct object_id
parse_fetch: convert to use struct object_id
add_sought_entry_mem: convert to struct object_id
Convert struct ref to use object_id.
sha1_file: introduce has_object_file helper.
Diffstat (limited to 'builtin/receive-pack.c')
| -rw-r--r-- | builtin/receive-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index f06f70a75..ca3813187 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -246,7 +246,7 @@ static void show_one_alternate_sha1(const unsigned char sha1[20], void *unused) static void collect_one_alternate_ref(const struct ref *ref, void *data) { struct sha1_array *sa = data; - sha1_array_append(sa, ref->old_sha1); + sha1_array_append(sa, ref->old_oid.hash); } static void write_head_info(void) |