summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-06-29 01:21:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-29 17:43:39 (GMT)
commit2122f6754c93be8f02bfb5704ed96c88fc9837a8 (patch)
tree859ca68d6cfa9b3a3198a80b1f97c8d4e191fad8 /builtin/merge-base.c
parent21e1ee8f4f4b7767d506b02504e97f6bcaef13a0 (diff)
downloadgit-2122f6754c93be8f02bfb5704ed96c88fc9837a8.zip
git-2122f6754c93be8f02bfb5704ed96c88fc9837a8.tar.gz
git-2122f6754c93be8f02bfb5704ed96c88fc9837a8.tar.bz2
commit: add repository argument to lookup_commit_reference
Add a repository argument to allow callers of lookup_commit_reference 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 'builtin/merge-base.c')
-rw-r--r--builtin/merge-base.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 3b76001..bbead6f 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -6,6 +6,7 @@
#include "diff.h"
#include "revision.h"
#include "parse-options.h"
+#include "repository.h"
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
{
@@ -42,7 +43,7 @@ static struct commit *get_commit_reference(const char *arg)
if (get_oid(arg, &revkey))
die("Not a valid object name %s", arg);
- r = lookup_commit_reference(&revkey);
+ r = lookup_commit_reference(the_repository, &revkey);
if (!r)
die("Not a valid commit name %s", arg);
@@ -171,7 +172,7 @@ static int handle_fork_point(int argc, const char **argv)
if (get_oid(commitname, &oid))
die("Not a valid object name: '%s'", commitname);
- derived = lookup_commit_reference(&oid);
+ derived = lookup_commit_reference(the_repository, &oid);
memset(&revs, 0, sizeof(revs));
revs.initial = 1;
for_each_reflog_ent(refname, collect_one_reflog_ent, &revs);