summaryrefslogtreecommitdiff
path: root/streaming.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-03-23 17:21:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-26 17:05:55 (GMT)
commite35454fa622dc5978100ad0aa5fa85dc02aa6a43 (patch)
tree62aa8e4fc963f812bbfdc95ac7afa9338bc8c437 /streaming.c
parent332295d7e4292d78c92ac36e4c794ab634ab9399 (diff)
downloadgit-e35454fa622dc5978100ad0aa5fa85dc02aa6a43.zip
git-e35454fa622dc5978100ad0aa5fa85dc02aa6a43.tar.gz
git-e35454fa622dc5978100ad0aa5fa85dc02aa6a43.tar.bz2
sha1_file: add repository argument to map_sha1_file
Add a repository argument to allow map_sha1_file callers to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. While at it, move the declaration to object-store.h, where it should be easier to find. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'streaming.c')
-rw-r--r--streaming.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/streaming.c b/streaming.c
index 5892b50..22d27df 100644
--- a/streaming.c
+++ b/streaming.c
@@ -3,6 +3,8 @@
*/
#include "cache.h"
#include "streaming.h"
+#include "repository.h"
+#include "object-store.h"
#include "packfile.h"
enum input_source {
@@ -335,7 +337,8 @@ static struct stream_vtbl loose_vtbl = {
static open_method_decl(loose)
{
- st->u.loose.mapped = map_sha1_file(sha1, &st->u.loose.mapsize);
+ st->u.loose.mapped = map_sha1_file(the_repository,
+ sha1, &st->u.loose.mapsize);
if (!st->u.loose.mapped)
return -1;
if ((unpack_sha1_header(&st->z,