diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:17:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:17:37 -0700 |
| commit | 5455ee0573a22bb793a7083d593ae1ace909cd4c (patch) | |
| tree | 3811517867826edb4bfa8ff2737b76af5c50784c /replace_object.c | |
| parent | c4a8354bc14e20d5ca6dc353e17e5b27fefefdab (diff) | |
| parent | 5cb901a4b0e19c87a1415f0f74995e54690598af (diff) | |
| download | git-5455ee0573a22bb793a7083d593ae1ace909cd4c.tar.gz | |
Merge branch 'bc/object-id'
for_each_ref() callback functions were taught to name the objects
not with "unsigned char sha1[20]" but with "struct object_id".
* bc/object-id: (56 commits)
struct ref_lock: convert old_sha1 member to object_id
warn_if_dangling_symref(): convert local variable "junk" to object_id
each_ref_fn_adapter(): remove adapter
rev_list_insert_ref(): remove unneeded arguments
rev_list_insert_ref_oid(): new function, taking an object_oid
mark_complete(): remove unneeded arguments
mark_complete_oid(): new function, taking an object_oid
clear_marks(): rewrite to take an object_id argument
mark_complete(): rewrite to take an object_id argument
send_ref(): convert local variable "peeled" to object_id
upload-pack: rewrite functions to take object_id arguments
find_symref(): convert local variable "unused" to object_id
find_symref(): rewrite to take an object_id argument
write_one_ref(): rewrite to take an object_id argument
write_refs_to_temp_dir(): convert local variable sha1 to object_id
submodule: rewrite to take an object_id argument
shallow: rewrite functions to take object_id arguments
handle_one_ref(): rewrite to take an object_id argument
add_info_ref(): rewrite to take an object_id argument
handle_one_reflog(): rewrite to take an object_id argument
...
Diffstat (limited to 'replace_object.c')
| -rw-r--r-- | replace_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/replace_object.c b/replace_object.c index 0ab2dc1374..f0b39f06d5 100644 --- a/replace_object.c +++ b/replace_object.c @@ -53,7 +53,7 @@ static int register_replace_object(struct replace_object *replace, } static int register_replace_ref(const char *refname, - const unsigned char *sha1, + const struct object_id *oid, int flag, void *cb_data) { /* Get sha1 from refname */ @@ -68,7 +68,7 @@ static int register_replace_ref(const char *refname, } /* Copy sha1 from the read ref */ - hashcpy(repl_obj->replacement, sha1); + hashcpy(repl_obj->replacement, oid->hash); /* Register new object */ if (register_replace_object(repl_obj, 1)) |