summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2009-01-23 10:07:01 +0100
committerJunio C Hamano <gitster@pobox.com>2009-05-31 17:02:59 -0700
commitf5552aee39d664bb8774c205341abd6db74b38d3 (patch)
tree858b9d76d47bb068cdd709baee81b1ff9ae3ec3f /sha1_file.c
parent680955702990c1d4bfb3c6feed6ae9c6cb5c3c07 (diff)
downloadgit-f5552aee39d664bb8774c205341abd6db74b38d3.tar.gz
sha1_file: add a "read_sha1_file_repl" function
This new function will replace "read_sha1_file". This latter function becoming just a stub to call the former will a NULL "replacement" argument. This new function is needed because sometimes we need to use the replacement sha1. 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.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 4bf24ffcf6..9119b795bd 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2145,8 +2145,10 @@ static void *read_object(const unsigned char *sha1, enum object_type *type,
return read_packed_sha1(sha1, type, size);
}
-void *read_sha1_file(const unsigned char *sha1, enum object_type *type,
- unsigned long *size)
+void *read_sha1_file_repl(const unsigned char *sha1,
+ enum object_type *type,
+ unsigned long *size,
+ const unsigned char **replacement)
{
const unsigned char *repl = lookup_replace_object(sha1);
void *data = read_object(repl, type, size);
@@ -2160,6 +2162,9 @@ void *read_sha1_file(const unsigned char *sha1, enum object_type *type,
if (!data && (has_loose_object(repl) || has_packed_and_bad(repl)))
die("object %s is corrupted", sha1_to_hex(repl));
+ if (replacement)
+ *replacement = repl;
+
return data;
}