diff options
| author | Stefan Beller <sbeller@google.com> | 2018-06-29 01:21:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 17:43:39 (GMT) |
| commit | 21e1ee8f4f4b7767d506b02504e97f6bcaef13a0 (patch) | |
| tree | fe7a386acffd7f8c142858d06a70153cbe3ba2c9 /fast-import.c | |
| parent | f86bcc7b2ce6cad68ba1a48a528e380c6126705e (diff) | |
| download | git-21e1ee8f4f4b7767d506b02504e97f6bcaef13a0.zip git-21e1ee8f4f4b7767d506b02504e97f6bcaef13a0.tar.gz git-21e1ee8f4f4b7767d506b02504e97f6bcaef13a0.tar.bz2 | |
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>
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c index 4d55910..3ea5781 100644 --- a/fast-import.c +++ b/fast-import.c @@ -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); |