development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-05 00:58:49 +00:00
Code Issues Projects Releases Wiki Activity

sha1_file: allow map_sha1_file_1 to handle arbitrary repositories

Browse Source 
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:
Jonathan Nieder 2018-03-23 18:21:19 +01:00 committed by Junio C Hamano
parent ec7283e586
commit 1fea63e1da
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sha1_file.c
View File

@ -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
* 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_the_repository(const char *path,
const unsigned char *sha1,
unsigned long *size)
static void *map_sha1_file_1(struct repository *r, const char *path,
const unsigned char *sha1, unsigned long *size)
{
void *map;
int fd;
@ -940,7 +938,7 @@ static void *map_sha1_file_1_the_repository(const char *path,
if (path)
fd = git_open(path);
else
fd = open_sha1_file(the_repository, sha1, &path);
fd = open_sha1_file(r, sha1, &path);
map = NULL;
if (fd >= 0) {
struct stat st;