Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rebase -i: rewrite setup_reflog_action() in C
[gitweb.git]
/
resolve-undo.c
diff --git
a/resolve-undo.c
b/resolve-undo.c
index aed95b4b35fbb187bb96242afcf6b4d8e3d2008b..fc5b3b83d9a08e9deed55ee15520387f147da626 100644
(file)
--- 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;
}