object: add repository argument to parse_object
Add a repository argument to allow the callers of parse_object to be more specific about which repository to act on. 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: Jonathan Nieder <jrnieder@gmail.com> 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
b16b60f71b
commit
109cd76dd3
@ -1,4 +1,5 @@
|
||||
#include "cache.h"
|
||||
#include "repository.h"
|
||||
#include "commit.h"
|
||||
#include "tag.h"
|
||||
#include "blob.h"
|
||||
@ -14,6 +15,7 @@
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
|
||||
#ifdef EXPAT_NEEDS_XMLPARSE_H
|
||||
#include <xmlparse.h>
|
||||
#else
|
||||
@ -722,7 +724,7 @@ static void one_remote_object(const struct object_id *oid)
|
||||
|
||||
obj = lookup_object(oid->hash);
|
||||
if (!obj)
|
||||
obj = parse_object(oid);
|
||||
obj = parse_object(the_repository, oid);
|
||||
|
||||
/* Ignore remote objects that don't exist locally */
|
||||
if (!obj)
|
||||
@ -1459,7 +1461,7 @@ static void add_remote_info_ref(struct remote_ls_ctx *ls)
|
||||
return;
|
||||
}
|
||||
|
||||
o = parse_object(&ref->old_oid);
|
||||
o = parse_object(the_repository, &ref->old_oid);
|
||||
if (!o) {
|
||||
fprintf(stderr,
|
||||
"Unable to parse object %s for remote ref %s\n",
|
||||
|
Reference in New Issue
Block a user