mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 10:26:25 +02:00
Code

register_replace_ref(): rewrite to take an object_id argument 

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2015-05-25 18:39:02 +00:00 committed by Junio C Hamano
parent 455ade6598
commit 00530834fb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
replace_object.c
View File

@ -53,7 +53,7 @@ static int register_replace_object(struct replace_object *replace,
} }
static int register_replace_ref(const char *refname, static int register_replace_ref(const char *refname,
const unsigned char *sha1, const struct object_id *oid,
int flag, void *cb_data) int flag, void *cb_data)
{ {
/* Get sha1 from refname */ /* Get sha1 from refname */
@ -68,7 +68,7 @@ static int register_replace_ref(const char *refname,
} }
/* Copy sha1 from the read ref */ /* Copy sha1 from the read ref */
hashcpy(repl_obj->replacement, sha1); hashcpy(repl_obj->replacement, oid->hash);
/* Register new object */ /* Register new object */
if (register_replace_object(repl_obj, 1)) if (register_replace_object(repl_obj, 1))
@ -80,13 +80,11 @@ static int register_replace_ref(const char *refname,
static void prepare_replace_object(void) static void prepare_replace_object(void)
{ {
static int replace_object_prepared; static int replace_object_prepared;
struct each_ref_fn_sha1_adapter wrapped_register_replace_ref =
{register_replace_ref, NULL};
if (replace_object_prepared) if (replace_object_prepared)
return; return;
for_each_replace_ref(each_ref_fn_adapter, &wrapped_register_replace_ref); for_each_replace_ref(register_replace_ref, NULL);
replace_object_prepared = 1; replace_object_prepared = 1;
if (!replace_object_nr) if (!replace_object_nr)
check_replace_refs = 0; check_replace_refs = 0;