undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: add repository argument to read_graft_file

Browse Source 
Add a repository argument to allow the caller of read_graft_file to be
more specific about which repository to handle. 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: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2018-05-15 16:42:19 -07:00 committed by Junio C Hamano
parent 3f5787f806
commit 02ba3e1a05
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commit.c
View File

@ -177,7 +177,8 @@ bad_graft_data:
return NULL; return NULL;
} }
static int read_graft_file(const char *graft_file) #define read_graft_file(r, f) read_graft_file_##r(f)
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;
@ -204,7 +205,7 @@ static void prepare_commit_graft(void)
if (commit_graft_prepared) if (commit_graft_prepared)
return; return;
graft_file = get_graft_file(); graft_file = get_graft_file();
read_graft_file(graft_file); read_graft_file(the_repository, graft_file);
/* make sure shallows are read */ /* make sure shallows are read */
is_repository_shallow(); is_repository_shallow();
commit_graft_prepared = 1; commit_graft_prepared = 1;