diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:25:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-02 13:59:50 +0900 |
| commit | 75691ea3458a9eb9e80f6bdc2cc7c9321a9ac4ab (patch) | |
| tree | 8046d90fc5f5c61bd06f27729f6a46b860f9c3db /unpack-trees.c | |
| parent | 2182abd94bf69a8daba18e71efae3e9f02a6c465 (diff) | |
| download | git-75691ea3458a9eb9e80f6bdc2cc7c9321a9ac4ab.tar.gz | |
Update struct index_state to use struct object_id
Adjust struct index_state to use struct object_id instead of unsigned
char [20].
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index e73745051e..038ef7b926 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1287,7 +1287,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->result.split_index = o->src_index->split_index; if (o->result.split_index) o->result.split_index->refcount++; - hashcpy(o->result.sha1, o->src_index->sha1); + oidcpy(&o->result.oid, &o->src_index->oid); o->merge_size = len; mark_all_ce_unused(o->src_index); |