mirror of
https://github.com/git/git
synced 2024-10-03 23:29:36 +00:00
sha1_file: allow map_sha1_file_1 to handle arbitrary repositories
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>
This commit is contained in:
parent
ec7283e586
commit
1fea63e1da
|
@ -929,10 +929,8 @@ static int open_sha1_file(struct repository *r,
|
||||||
* Map the loose object at "path" if it is not NULL, or the path found by
|
* Map the loose object at "path" if it is not NULL, or the path found by
|
||||||
* searching for a loose object named "sha1".
|
* searching for a loose object named "sha1".
|
||||||
*/
|
*/
|
||||||
#define map_sha1_file_1(r, p, s, si) map_sha1_file_1_##r(p, s, si)
|
static void *map_sha1_file_1(struct repository *r, const char *path,
|
||||||
static void *map_sha1_file_1_the_repository(const char *path,
|
const unsigned char *sha1, unsigned long *size)
|
||||||
const unsigned char *sha1,
|
|
||||||
unsigned long *size)
|
|
||||||
{
|
{
|
||||||
void *map;
|
void *map;
|
||||||
int fd;
|
int fd;
|
||||||
|
@ -940,7 +938,7 @@ static void *map_sha1_file_1_the_repository(const char *path,
|
||||||
if (path)
|
if (path)
|
||||||
fd = git_open(path);
|
fd = git_open(path);
|
||||||
else
|
else
|
||||||
fd = open_sha1_file(the_repository, sha1, &path);
|
fd = open_sha1_file(r, sha1, &path);
|
||||||
map = NULL;
|
map = NULL;
|
||||||
if (fd >= 0) {
|
if (fd >= 0) {
|
||||||
struct stat st;
|
struct stat st;
|
||||||
|
|
Loading…
Reference in a new issue