summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2018-05-02 00:25:29 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-02 13:59:48 +0900
commit69d124255ede771ff8162652762406c55ba491c0 (patch)
tree3249ee68c31622d295b8086a435acffe8441d045 /resolve-undo.c
parentMerge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn (diff)
downloadtgif-69d124255ede771ff8162652762406c55ba491c0.tar.xz
cache: add a function to read an object ID from a buffer
In various places throughout the codebase, we need to read data into a struct object_id from a pack or other unsigned char buffer. Add an inline function that does this based on the current hash algorithm in use, and use it in several places. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
-rw-r--r--resolve-undo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.c b/resolve-undo.c
index aed95b4b35..fc5b3b83d9 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -90,7 +90,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
continue;
if (size < rawsz)
goto error;
- memcpy(ui->oid[i].hash, (const unsigned char *)data, rawsz);
+ oidread(&ui->oid[i], (const unsigned char *)data);
size -= rawsz;
data += rawsz;
}