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 /sha1-name.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 'sha1-name.c')
| -rw-r--r-- | sha1-name.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sha1-name.c b/sha1-name.c index dd19aba..4736118 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -1251,13 +1251,13 @@ int get_oid_mb(const char *name, struct object_id *oid) } if (st) return st; - one = lookup_commit_reference_gently(&oid_tmp, 0); + one = lookup_commit_reference_gently(the_repository, &oid_tmp, 0); if (!one) return -1; if (get_oid_committish(dots[3] ? (dots + 3) : "HEAD", &oid_tmp)) return -1; - two = lookup_commit_reference_gently(&oid_tmp, 0); + two = lookup_commit_reference_gently(the_repository, &oid_tmp, 0); if (!two) return -1; mbs = get_merge_bases(one, two); |