mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert lookup_replace_object to struct object_id

Browse Source 
Convert both the argument and the return value to be pointers to struct
object_id.  Update the callers and their internals to deal with the new
type.  Remove several temporaries which are no longer needed.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2018-03-12 02:27:54 +00:00
committed by Junio C Hamano
parent b4f5aca40e
commit b383a13cc0
6 changed files with 42 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
replace_object.c
View File

@ -92,16 +92,16 @@ static void prepare_replace_object(void)
#define MAXREPLACEDEPTH 5
/*
* If a replacement for object sha1 has been set up, return the
* If a replacement for object oid has been set up, return the
* replacement object's name (replaced recursively, if necessary).
* The return value is either sha1 or a pointer to a
* The return value is either oid or a pointer to a
* permanently-allocated value. This function always respects replace
* references, regardless of the value of check_replace_refs.
*/
const unsigned char *do_lookup_replace_object(const unsigned char *sha1)
const struct object_id *do_lookup_replace_object(const struct object_id *oid)
{
int pos, depth = MAXREPLACEDEPTH;
const unsigned char *cur = sha1;
const struct object_id *cur = oid;
prepare_replace_object();
@ -109,11 +109,11 @@ const unsigned char *do_lookup_replace_object(const unsigned char *sha1)
do {
if (--depth < 0)
die("replace depth too high for object %s",
sha1_to_hex(sha1));
oid_to_hex(oid));
pos = replace_object_pos(cur);
pos = replace_object_pos(cur->hash);
if (0 <= pos)
cur = replace_object[pos]->replacement.hash;
cur = &replace_object[pos]->replacement;
} while (0 <= pos);
return cur;