kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

commit: convert read_graft_file to handle arbitrary repositories 

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 2018-05-17 15:51:49 -07:00 committed by Junio C Hamano
parent a3b78e833b
commit d0e5dd0ed4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commit.c
View File

@ -177,8 +177,7 @@ bad_graft_data:
return NULL; return NULL;
} }


#define read_graft_file(r, f) read_graft_file_##r(f) static int read_graft_file(struct repository *r, const char *graft_file)
static int read_graft_file_the_repository(const char *graft_file)
{ {
FILE *fp = fopen_or_warn(graft_file, "r"); FILE *fp = fopen_or_warn(graft_file, "r");
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
@ -189,7 +188,7 @@ static int read_graft_file_the_repository(const char *graft_file)
struct commit_graft *graft = read_graft_line(&buf); struct commit_graft *graft = read_graft_line(&buf);
if (!graft) if (!graft)
continue; continue;
if (register_commit_graft(the_repository, graft, 1)) if (register_commit_graft(r, graft, 1))
error("duplicate graft data: %s", buf.buf); error("duplicate graft data: %s", buf.buf);
} }
fclose(fp); fclose(fp);