undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

object: call "check_sha1_signature" with the replacement sha1

Browse Source 
Otherwise we get a "sha1 mismatch" error for replaced objects.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2009-01-23 10:07:10 +01:00 committed by Junio C Hamano
parent f5552aee39
commit 0e87c36763
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
object.c
View File

@ -188,17 +188,18 @@ struct object *parse_object(const unsigned char *sha1)
unsigned long size; unsigned long size;
enum object_type type; enum object_type type;
int eaten; 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) { if (buffer) {
struct object *obj; 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); free(buffer);
error("sha1 mismatch %s\n", sha1_to_hex(sha1)); error("sha1 mismatch %s\n", sha1_to_hex(repl));
return NULL; return NULL;
} }
obj = parse_object_buffer(sha1, type, size, buffer, &eaten); obj = parse_object_buffer(repl, type, size, buffer, &eaten);
if (!eaten) if (!eaten)
free(buffer); free(buffer);
return obj; return obj;