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

add_ref_decoration(): rewrite to take an object_id argument

Browse Source 
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:38:57 +00:00 committed by Junio C Hamano
parent 5f9cf5abd2
commit f124b73023
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
log-tree.c
View File

@ -89,7 +89,8 @@ const struct name_decoration *get_name_decoration(const struct object *obj)
return lookup_decoration(&name_decoration, obj); return lookup_decoration(&name_decoration, obj);
} }
static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data) static int add_ref_decoration(const char *refname, const struct object_id *oid,
int flags, void *cb_data)
{ {
struct object *obj; struct object *obj;
enum decoration_type type = DECORATION_NONE; enum decoration_type type = DECORATION_NONE;
@ -110,7 +111,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
return 0; return 0;
} }
obj = parse_object(sha1); obj = parse_object(oid->hash);
if (!obj) if (!obj)
return 0; return 0;
@ -149,13 +150,11 @@ static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
void load_ref_decorations(int flags) void load_ref_decorations(int flags)
{ {
if (!decoration_loaded) { if (!decoration_loaded) {
struct each_ref_fn_sha1_adapter wrapped_add_ref_decoration =
{add_ref_decoration, NULL};
decoration_loaded = 1; decoration_loaded = 1;
decoration_flags = flags; decoration_flags = flags;
for_each_ref(each_ref_fn_adapter, &wrapped_add_ref_decoration); for_each_ref(add_ref_decoration, NULL);
head_ref(each_ref_fn_adapter, &wrapped_add_ref_decoration); head_ref(add_ref_decoration, NULL);
for_each_commit_graft(add_graft_decoration, NULL); for_each_commit_graft(add_graft_decoration, NULL);
} }
} }