Re: [PATCH] bisect: debug: convert struct object to object_id
From: Junio C Hamano <hidden>
Date: 2018-01-09 18:57:43
Yasushi SHOJI [off-list ref] writes:
The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct object to object_id but a debug function show_list(), which is ifdef'ed to noop, in bisect.c wasn't. So fix it. Signed-off-by: Yasushi SHOJI <redacted> ---
Thanks. That's quite an old breakage ;-)
quoted hunk
bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)diff --git a/bisect.c b/bisect.c index 3756f127b..0dd0f289a 100644 --- a/bisect.c +++ b/bisect.c@@ -132,7 +132,7 @@ static void show_list(const char *debug, int counted, int nr, unsigned flags = commit->object.flags; enum object_type type; unsigned long size; - char *buf = read_sha1_file(commit->object.sha1, &type, &size); + char *buf = read_sha1_file(commit->object.oid.hash, &type, &size); const char *subject_start; int subject_len;@@ -144,10 +144,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.sha1)); + fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash)); for (pp = commit->parents; pp; pp = pp->next) fprintf(stderr, " %.*s", 8, - sha1_to_hex(pp->item->object.sha1)); + sha1_to_hex(pp->item->object.oid.hash)); subject_len = find_commit_subject(buf, &subject_start); if (subject_len)