kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

replace-object: add repository argument to lookup_replace_object 

Add a repository argument to allow callers of lookup_replace_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: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2018-04-11 17:21:13 -07:00 committed by Junio C Hamano
parent 9dfe98a8b3
commit 1f2e7ceabc
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/mktag.c
View File

@ -25,7 +25,7 @@ static int verify_object(const struct object_id *oid, const char *expected_type)
enum object_type type; enum object_type type;
unsigned long size; unsigned long size;
void *buffer = read_object_file(oid, &type, &size); void *buffer = read_object_file(oid, &type, &size);
const struct object_id *repl = lookup_replace_object(oid); const struct object_id *repl = lookup_replace_object(the_repository, oid);


if (buffer) { if (buffer) {
if (type == type_from_string(expected_type)) if (type == type_from_string(expected_type))

2
object.c
View File

@ -247,7 +247,7 @@ struct object *parse_object(const struct object_id *oid)
unsigned long size; unsigned long size;
enum object_type type; enum object_type type;
int eaten; int eaten;
const struct object_id *repl = lookup_replace_object(oid); const struct object_id *repl = lookup_replace_object(the_repository, oid);
void *buffer; void *buffer;
struct object *obj; struct object *obj;



3
replace-object.h
View File

@ -23,7 +23,8 @@ extern const struct object_id *do_lookup_replace_object_the_repository(const str
* either sha1 or a pointer to a permanently-allocated value. When * either sha1 or a pointer to a permanently-allocated value. When
* object replacement is suppressed, always return sha1. * object replacement is suppressed, always return sha1.
*/ */
static inline const struct object_id *lookup_replace_object(const struct object_id *oid) #define lookup_replace_object(r, s) lookup_replace_object_##r(s)
static inline const struct object_id *lookup_replace_object_the_repository(const struct object_id *oid)
{ {
if (!check_replace_refs || if (!check_replace_refs ||
(the_repository->objects->replace_map && (the_repository->objects->replace_map &&

6
sha1_file.c
View File

@ -1240,7 +1240,7 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
int already_retried = 0; int already_retried = 0;


if (flags & OBJECT_INFO_LOOKUP_REPLACE) if (flags & OBJECT_INFO_LOOKUP_REPLACE)
real = lookup_replace_object(oid); real = lookup_replace_object(the_repository, oid);


if (is_null_oid(real)) if (is_null_oid(real))
return -1; return -1;
@ -1384,8 +1384,8 @@ void *read_object_file_extended(const struct object_id *oid,
const struct packed_git *p; const struct packed_git *p;
const char *path; const char *path;
struct stat st; struct stat st;
const struct object_id *repl = lookup_replace ? lookup_replace_object(oid) const struct object_id *repl = lookup_replace ?
: oid; lookup_replace_object(the_repository, oid) : oid;


errno = 0; errno = 0;
data = read_object(repl->hash, type, size); data = read_object(repl->hash, type, size);

2
streaming.c
View File

@ -140,7 +140,7 @@ struct git_istream *open_istream(const struct object_id *oid,
{ {
struct git_istream *st; struct git_istream *st;
struct object_info oi = OBJECT_INFO_INIT; struct object_info oi = OBJECT_INFO_INIT;
const struct object_id *real = lookup_replace_object(oid); const struct object_id *real = lookup_replace_object(the_repository, oid);
enum input_source src = istream_source(real, type, &oi); enum input_source src = istream_source(real, type, &oi);


if (src < 0) if (src < 0)