undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace-object: allow lookup_replace_object to handle arbitrary repositories

Browse Source 
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2018-04-11 17:21:18 -07:00 committed by Junio C Hamano
parent 5643557e63
commit 90e777f1e2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
replace-object.h
View File

@ -23,14 +23,14 @@ extern const struct object_id *do_lookup_replace_object(struct repository *r,
* 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.
*/ */
#define lookup_replace_object(r, s) lookup_replace_object_##r(s) static inline const struct object_id *lookup_replace_object(struct repository *r,
static inline const struct object_id *lookup_replace_object_the_repository(const struct object_id *oid) const struct object_id *oid)
{ {
if (!check_replace_refs || if (!check_replace_refs ||
(the_repository->objects->replace_map && (r->objects->replace_map &&
the_repository->objects->replace_map->map.tablesize == 0)) r->objects->replace_map->map.tablesize == 0))
return oid; return oid;
return do_lookup_replace_object(the_repository, oid); return do_lookup_replace_object(r, oid);
} }
#endif /* REPLACE_OBJECT_H */ #endif /* REPLACE_OBJECT_H */