diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2009-01-23 10:06:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-31 17:02:59 -0700 |
| commit | 680955702990c1d4bfb3c6feed6ae9c6cb5c3c07 (patch) | |
| tree | 44ee65b637c621cafc717ef76f1c196bcf28f17c /sha1_file.c | |
| parent | 292687003abcfb68d296c57d7e812b0469f74647 (diff) | |
| download | git-680955702990c1d4bfb3c6feed6ae9c6cb5c3c07.tar.gz | |
replace_object: add mechanism to replace objects found in "refs/replace/"
The code implementing this mechanism has been copied more-or-less
from the commit graft code.
This mechanism is used in "read_sha1_file". sha1 passed to this
function that match a ref name in "refs/replace/" are replaced by
the sha1 that has been read in the ref.
We "die" if the replacement recursion depth is too high or if we
can't read the replacement object.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sha1_file.c b/sha1_file.c index e73cd4fc0b..4bf24ffcf6 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2148,10 +2148,18 @@ static void *read_object(const unsigned char *sha1, enum object_type *type, void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size) { - void *data = read_object(sha1, type, size); + const unsigned char *repl = lookup_replace_object(sha1); + void *data = read_object(repl, type, size); + + /* die if we replaced an object with one that does not exist */ + if (!data && repl != sha1) + die("replacement %s not found for %s", + sha1_to_hex(repl), sha1_to_hex(sha1)); + /* legacy behavior is to die on corrupted objects */ - if (!data && (has_loose_object(sha1) || has_packed_and_bad(sha1))) - die("object %s is corrupted", sha1_to_hex(sha1)); + if (!data && (has_loose_object(repl) || has_packed_and_bad(repl))) + die("object %s is corrupted", sha1_to_hex(repl)); + return data; } |