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

add_ref_decoration(): convert local variable original_sha1 to object_id

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:58 +00:00
committed by Junio C Hamano
parent f124b73023
commit 3d79f65735
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
log-tree.c
View File

@ -98,14 +98,14 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
assert(cb_data == NULL); assert(cb_data == NULL);
if (starts_with(refname, "refs/replace/")) { if (starts_with(refname, "refs/replace/")) {
unsigned char original_sha1[20]; struct object_id original_oid;
if (!check_replace_refs) if (!check_replace_refs)
return 0; return 0;
if (get_sha1_hex(refname + 13, original_sha1)) { if (get_oid_hex(refname + 13, &original_oid)) {
warning("invalid replace ref %s", refname); warning("invalid replace ref %s", refname);
return 0; return 0;
} }
obj = parse_object(original_sha1); obj = parse_object(original_oid.hash);
if (obj) if (obj)
add_name_decoration(DECORATION_GRAFTED, "replaced", obj); add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
return 0; return 0;