diff options
| author |  Brandon Williams <bmwill@google.com> | 2018-05-17 15:51:49 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-18 08:13:10 +0900 |
| commit | d0e5dd0ed49a8e79dab8a027ab14ee29709b47c6 (patch) | |
| tree | 311fc72ae5ed1a998e6ebeadefc355b959fc3a86 | |
| parent | commit: convert register_commit_graft to handle arbitrary repositories (diff) | |
| download | tgif-d0e5dd0ed49a8e79dab8a027ab14ee29709b47c6.tar.xz | |
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>
| -rw-r--r-- | commit.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -177,8 +177,7 @@ bad_graft_data: return NULL; } -#define read_graft_file(r, f) read_graft_file_##r(f) -static int read_graft_file_the_repository(const char *graft_file) +static int read_graft_file(struct repository *r, const char *graft_file) { FILE *fp = fopen_or_warn(graft_file, "r"); 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); if (!graft) continue; - if (register_commit_graft(the_repository, graft, 1)) + if (register_commit_graft(r, graft, 1)) error("duplicate graft data: %s", buf.buf); } fclose(fp); |