From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Apr 2018 07:28:24 +0000 (+0900)
Subject: Merge branch 'ys/bisect-object-id-missing-conversion-fix'
X-Git-Tag: v2.18.0-rc0~151
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa1c2b6804808b127620772fa959a6b4c8556d2a?hp=9aa3a4c406e1db08269cc8f6e8757555bd771120

Merge branch 'ys/bisect-object-id-missing-conversion-fix'

Code clean-up.

* ys/bisect-object-id-missing-conversion-fix:
bisect: use oid_to_hex() for converting object_id hashes to hex strings
---

diff --git a/bisect.c b/bisect.c
index ad395bb2b8..a579b50884 100644
--- a/bisect.c
+++ b/bisect.c
@@ -145,10 +145,10 @@ static void show_list(const char *debug, int counted, int nr,
 			fprintf(stderr, "%3d", weight(p));
 		else
 			fprintf(stderr, "---");
-		fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash));
+		fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid));
 		for (pp = commit->parents; pp; pp = pp->next)
 			fprintf(stderr, " %.*s", 8,
-				sha1_to_hex(pp->item->object.oid.hash));
+				oid_to_hex(&pp->item->object.oid));
 
 		subject_len = find_commit_subject(buf, &subject_start);
 		if (subject_len)