From: Jonathan Nieder <jrnie...@gmail.com>
Add a repository argument to allow sha1_object_info_extended callers
to be more specific about which repository to act on. 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.
Signed-off-by: Stefan Beller <sbel...@google.com>
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
builtin/cat-file.c | 6 +++---
cache.h | 4 +++-
packfile.c | 2 +-
sha1_file.c | 11 ++++++-----
streaming.c | 2 +-
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index f5fa4fd75a..9d18efeb7c 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -77,7 +77,7 @@ static int cat_one_file(int opt, const char *exp_type, const
char *obj_name,
switch (opt) {
case 't':
oi.typename = &sb;
- if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
+ if (sha1_object_info_extended(the_repository, oid.hash, &oi,
flags) < 0)
die("git cat-file: could not get object info");
if (sb.len) {
printf("%s\n", sb.buf);
@@ -88,7 +88,7 @@ static int cat_one_file(int opt, const char *exp_type, const
char *obj_name,
case 's':
oi.sizep = &size;
- if (sha1_object_info_extended(oid.hash, &oi, flags) < 0)
+ if (sha1_object_info_extended(the_repository, oid.hash, &oi,
flags) < 0)
die("git cat-file: could not get object info");
printf("%lu\n", size);
return 0;
@@ -340,7 +340,7 @@ static void batch_object_write(const char *obj_name, struct
batch_options *opt,
struct strbuf buf = STRBUF_INIT;
if (!data->skip_object_info &&
- sha1_object_info_extended(data->oid.hash, &data->info,
+ sha1_object_info_extended(the_repository, data->oid.hash,
&data->info,
OBJECT_INFO_LOOKUP_REPLACE) < 0) {
printf("%s missing\n",
obj_name ? obj_name : oid_to_hex(&data->oid));
diff --git a/cache.h b/cache.h
index ce309cfe3f..3410a93737 100644
--- a/cache.h
+++ b/cache.h
@@ -1749,7 +1749,9 @@ struct object_info {
#define OBJECT_INFO_SKIP_CACHED 4
/* Do not retry packed storage after checking packed and loose storage */
#define OBJECT_INFO_QUICK 8
-extern int sha1_object_info_extended(const unsigned char *, struct object_info
*, unsigned flags);
+#define sha1_object_info_extended(r, s, oi, f) \
+ sha1_object_info_extended_##r(s, oi, f)
+extern int sha1_object_info_extended_the_repository(const unsigned char *,
struct object_info *, unsigned flags);
/* Dumb servers support */
extern int update_server_info(int);
diff --git a/packfile.c b/packfile.c
index 7aa69dd3c0..0ca13a4ed7 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1450,7 +1450,7 @@ static void *read_object(const unsigned char *sha1, enum
object_type *type,
oi.sizep = size;
oi.contentp = &content;
- if (sha1_object_info_extended(sha1, &oi, 0) < 0)
+ if (sha1_object_info_extended(the_repository, sha1, &oi, 0) < 0)
return NULL;
return content;
}
diff --git a/sha1_file.c b/sha1_file.c
index 1e867bc293..a5dcb76d96 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1234,7 +1234,7 @@ static int sha1_loose_object_info(struct repository *r,
return (status < 0) ? status : 0;
}
-int sha1_object_info_extended(const unsigned char *sha1, struct object_info
*oi, unsigned flags)
+int sha1_object_info_extended_the_repository(const unsigned char *sha1, struct
object_info *oi, unsigned flags)
{
static struct object_info blank_oi = OBJECT_INFO_INIT;
struct pack_entry e;
@@ -1294,7 +1294,8 @@ int sha1_object_info_extended(const unsigned char *sha1,
struct object_info *oi,
rtype = packed_object_info(e.p, e.offset, oi);
if (rtype < 0) {
mark_bad_packed_object(e.p, real);
- return sha1_object_info_extended(real, oi, 0);
+ return sha1_object_info_extended(the_repository, real, oi,
+ 0);
} else if (oi->whence == OI_PACKED) {
oi->u.packed.offset = e.offset;
oi->u.packed.pack = e.p;
@@ -1313,7 +1314,7 @@ int sha1_object_info(const unsigned char *sha1, unsigned
long *sizep)
oi.typep = &type;
oi.sizep = sizep;
- if (sha1_object_info_extended(sha1, &oi,
+ if (sha1_object_info_extended(the_repository, sha1, &oi,
OBJECT_INFO_LOOKUP_REPLACE) < 0)
return -1;
return type;
@@ -1328,7 +1329,7 @@ static void *read_object(const unsigned char *sha1, enum
object_type *type,
oi.sizep = size;
oi.contentp = &content;
- if (sha1_object_info_extended(sha1, &oi, 0) < 0)
+ if (sha1_object_info_extended(the_repository, sha1, &oi, 0) < 0)
return NULL;
return content;
}
@@ -1715,7 +1716,7 @@ int has_sha1_file_with_flags(const unsigned char *sha1,
int flags)
{
if (!startup_info->have_repository)
return 0;
- return sha1_object_info_extended(sha1, NULL,
+ return sha1_object_info_extended(the_repository, sha1, NULL,
flags | OBJECT_INFO_SKIP_CACHED) >= 0;
}
diff --git a/streaming.c b/streaming.c
index 22d27df55e..47fca9aba0 100644
--- a/streaming.c
+++ b/streaming.c
@@ -116,7 +116,7 @@ static enum input_source istream_source(const unsigned char
*sha1,
oi->typep = type;
oi->sizep = &size;
- status = sha1_object_info_extended(sha1, oi, 0);
+ status = sha1_object_info_extended(the_repository, sha1, oi, 0);
if (status < 0)
return stream_error;
--
2.15.1.433.g936d1b9894.dirty
