[PATCH 4/7] object: call "check_sha1_signature" with the replacement sha1
From: Christian Couder <hidden>
Date: 2016-06-15 22:46:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Otherwise we get a "sha1 mismatch" error for replaced objects. Signed-off-by: Christian Couder <redacted> --- object.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/object.c b/object.c
index 50b6528..217bee9 100644
--- a/object.c
+++ b/object.c@@ -187,17 +187,18 @@ struct object *parse_object(const unsigned char *sha1) unsigned long size; enum object_type type; int eaten; - void *buffer = read_sha1_file(sha1, &type, &size); + const unsigned char *repl; + void *buffer = read_sha1_file_repl(sha1, &type, &size, &repl); if (buffer) { struct object *obj; - if (check_sha1_signature(sha1, buffer, size, typename(type)) < 0) { + if (check_sha1_signature(repl, buffer, size, typename(type)) < 0) { free(buffer); - error("sha1 mismatch %s\n", sha1_to_hex(sha1)); + error("sha1 mismatch %s\n", sha1_to_hex(repl)); return NULL; } - obj = parse_object_buffer(sha1, type, size, buffer, &eaten); + obj = parse_object_buffer(repl, type, size, buffer, &eaten); if (!eaten) free(buffer); return obj;
--
1.6.1.231.g9c286