commit: add repository argument to lookup_commit_reference_gently
Add a repository argument to allow callers of lookup_commit_reference_gently 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: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
f86bcc7b2c
commit
21e1ee8f4f
@ -1724,8 +1724,10 @@ static int update_branch(struct branch *b)
|
||||
if (!force_update && !is_null_oid(&old_oid)) {
|
||||
struct commit *old_cmit, *new_cmit;
|
||||
|
||||
old_cmit = lookup_commit_reference_gently(&old_oid, 0);
|
||||
new_cmit = lookup_commit_reference_gently(&b->oid, 0);
|
||||
old_cmit = lookup_commit_reference_gently(the_repository,
|
||||
&old_oid, 0);
|
||||
new_cmit = lookup_commit_reference_gently(the_repository,
|
||||
&b->oid, 0);
|
||||
if (!old_cmit || !new_cmit)
|
||||
return error("Branch %s is missing commits.", b->name);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user