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

commit: add repository argument to prepare_commit_graft 

Add a repository argument to allow the caller of prepare_commit_graft
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>
maint
Jonathan Nieder 2018-05-15 16:42:20 -07:00 committed by Junio C Hamano
parent 02ba3e1a05
commit 3ee37656ee
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

@ -197,7 +197,8 @@ static int read_graft_file_the_repository(const char *graft_file)
return 0; return 0;
} }


static void prepare_commit_graft(void) #define prepare_commit_graft(r) prepare_commit_graft_##r()
static void prepare_commit_graft_the_repository(void)
{ {
static int commit_graft_prepared; static int commit_graft_prepared;
char *graft_file; char *graft_file;
@ -214,7 +215,7 @@ static void prepare_commit_graft(void)
struct commit_graft *lookup_commit_graft(const struct object_id *oid) struct commit_graft *lookup_commit_graft(const struct object_id *oid)
{ {
int pos; int pos;
prepare_commit_graft(); prepare_commit_graft(the_repository);
pos = commit_graft_pos(the_repository, oid->hash); pos = commit_graft_pos(the_repository, oid->hash);
if (pos < 0) if (pos < 0)
return NULL; return NULL;