diff options
| author | Stefan Beller <sbeller@google.com> | 2018-06-29 03:21:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 19:43:38 +0200 |
| commit | 5abddd1eb72ca47cc84a9fc888c30ebaadde2eec (patch) | |
| tree | 3aa159b370a0ecc3ac88e8b3453c049f72af15c3 /builtin | |
| parent | object: add repository argument to parse_object (diff) | |
| download | git-5abddd1eb72ca47cc84a9fc888c30ebaadde2eec.tar.xz git-5abddd1eb72ca47cc84a9fc888c30ebaadde2eec.zip | |
object: add repository argument to lookup_object
Add a repository argument to allow callers of lookup_object 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')
| -rw-r--r-- | builtin/fast-export.c | 5 | ||||
| -rw-r--r-- | builtin/fsck.c | 5 | ||||
| -rw-r--r-- | builtin/name-rev.c | 3 | ||||
| -rw-r--r-- | builtin/prune.c | 2 | ||||
| -rw-r--r-- | builtin/unpack-objects.c | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index a16aeaa826..e39c4e2c1d 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -230,7 +230,7 @@ static void export_blob(const struct object_id *oid) if (is_null_oid(oid)) return; - object = lookup_object(oid->hash); + object = lookup_object(the_repository, oid->hash); if (object && object->flags & SHOWN) return; @@ -402,7 +402,8 @@ static void show_filemodify(struct diff_queue_struct *q, anonymize_sha1(&spec->oid) : spec->oid.hash)); else { - struct object *object = lookup_object(spec->oid.hash); + struct object *object = lookup_object(the_repository, + spec->oid.hash); printf("M %06o :%d ", spec->mode, get_object_mark(object)); } diff --git a/builtin/fsck.c b/builtin/fsck.c index 2b0930101d..12d01e9174 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -410,7 +410,7 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid, struct object *obj; if (!is_null_oid(oid)) { - obj = lookup_object(oid->hash); + obj = lookup_object(the_repository, oid->hash); if (obj && (obj->flags & HAS_OBJ)) { if (timestamp && name_objects) add_decoration(fsck_walk_options.object_names, @@ -763,7 +763,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) const char *arg = argv[i]; struct object_id oid; if (!get_oid(arg, &oid)) { - struct object *obj = lookup_object(oid.hash); + struct object *obj = lookup_object(the_repository, + oid.hash); if (!obj || !(obj->flags & HAS_OBJ)) { if (is_promisor_object(&oid)) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index de54fa93e4..f6eb419a02 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -379,7 +379,8 @@ static void name_rev_line(char *p, struct name_ref_data *data) *(p+1) = 0; if (!get_oid(p - (GIT_SHA1_HEXSZ - 1), &oid)) { struct object *o = - lookup_object(oid.hash); + lookup_object(the_repository, + oid.hash); if (o) name = get_rev_name(o, &buf); } diff --git a/builtin/prune.c b/builtin/prune.c index 70ec35aa05..72b0621b76 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -40,7 +40,7 @@ static int prune_object(const struct object_id *oid, const char *fullpath, * Do we know about this object? * It must have been reachable */ - if (lookup_object(oid->hash)) + if (lookup_object(the_repository, oid->hash)) return 0; if (lstat(fullpath, &st)) { diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index cf585fcc5e..335b5ed9a0 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -331,7 +331,7 @@ static int resolve_against_held(unsigned nr, const struct object_id *base, { struct object *obj; struct obj_buffer *obj_buffer; - obj = lookup_object(base->hash); + obj = lookup_object(the_repository, base->hash); if (!obj) return 0; obj_buffer = lookup_object_buffer(obj); |