From: Stefan Beller <sbeller@xxxxxxxxxx>
Add a repository argument to allow the open_sha1_file caller 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 <sbeller@xxxxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
sha1_file.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index d3573cec62..893e37afec 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -840,7 +840,9 @@ static int stat_sha1_file_the_repository(const unsigned char *sha1,
* Like stat_sha1_file(), but actually open the object and return the
* descriptor. See the caveats on the "path" parameter above.
*/
-static int open_sha1_file(const unsigned char *sha1, const char **path)
+#define open_sha1_file(r, s, p) open_sha1_file_##r(s, p)
+static int open_sha1_file_the_repository(const unsigned char *sha1,
+ const char **path)
{
int fd;
struct alternate_object_database *alt;
@@ -879,7 +881,7 @@ static void *map_sha1_file_1(const char *path,
if (path)
fd = git_open(path);
else
- fd = open_sha1_file(sha1, &path);
+ fd = open_sha1_file(the_repository, sha1, &path);
map = NULL;
if (fd >= 0) {
struct stat st;
--
2.14.1.581.gf28d330327
