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

add_ref_decoration(): rename s/type/deco_type/

Browse Source 
Now that we have two types (a decoration type and an object type) in the
function, let's give them both unique names to avoid accidentally using
one instead of the other.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2021-06-22 13:09:26 -04:00 committed by Junio C Hamano
parent 88473c8bae
commit 6afb265b96
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
log-tree.c
View File

@ -135,7 +135,7 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
{
struct object *obj;
enum object_type objtype;
enum decoration_type type = DECORATION_NONE;
enum decoration_type deco_type = DECORATION_NONE;
struct decoration_filter *filter = (struct decoration_filter *)cb_data;
if (filter && !ref_filter_match(refname, filter))
@ -162,17 +162,17 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
obj = lookup_object_by_type(the_repository, oid, objtype);
if (starts_with(refname, "refs/heads/"))
type = DECORATION_REF_LOCAL;
deco_type = DECORATION_REF_LOCAL;
else if (starts_with(refname, "refs/remotes/"))
type = DECORATION_REF_REMOTE;
deco_type = DECORATION_REF_REMOTE;
else if (starts_with(refname, "refs/tags/"))
type = DECORATION_REF_TAG;
deco_type = DECORATION_REF_TAG;
else if (!strcmp(refname, "refs/stash"))
type = DECORATION_REF_STASH;
deco_type = DECORATION_REF_STASH;
else if (!strcmp(refname, "HEAD"))
type = DECORATION_REF_HEAD;
deco_type = DECORATION_REF_HEAD;
add_name_decoration(type, refname, obj);
add_name_decoration(deco_type, refname, obj);
while (obj->type == OBJ_TAG) {
obj = ((struct tag *)obj)->tagged;
if (!obj)