bisect: debug: convert struct object to object_id

The commit f2fd0760 ("Convert struct object to object_id",
2015-11-10) converted struct object to object_id but forgot to
adjust a few callers in a debug function show_list(), which is
ifdef'ed to noop, in bisect.c.

Signed-off-by: Yasushi SHOJI <Yasushi.SHOJI@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.c b/bisect.c
index 30808cadf7613d73cae2e4caaedd922ba9a48ca0..6feed853374c0a92db9b4d21722facb38b20284b 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -131,7 +131,7 @@ static void show_list(const char *debug, int counted, int nr,
                unsigned flags = commit->object.flags;
                enum object_type type;
                unsigned long size;
                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;
 
                const char *subject_start;
                int subject_len;
 


@@ -143,10 +143,10 @@ static void show_list(const char *debug, int counted, int nr,
                        fprintf(stderr, "%3d", weight(p));
                else
                        fprintf(stderr, "---");
                        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,
                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)
 
                subject_len = find_commit_subject(buf, &subject_start);
                if (subject_len)