Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

From

AHAlex Hoffman <spec@gal.ro>

Date

Mar 21, 2017, 21:24 UTC

Message-ID

<CAMX8fZXqTfKQXxV_pZEieN=1ap8ocVnnwZUvpGuw5rWo5_Yhfg@mail.gmail.com>

In-Reply-To

<20170320221429.qefqowtwe2ptvgdg@genre.crustytoothpaste.net>

Hi, Brian,

---
 bisect.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bisect.c b/bisect.c
index 30808cadf..7b65acbcd 100644
--- 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;
-               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;

@@ -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, " %.*s", 8, sha1_to_hex(commit->object.sha1));
+               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.sha1));
+                                       oid_to_hex(&pp->item->object.oid));

                subject_len = find_commit_subject(buf, &subject_start);
                if (subject_len)

-- 
2.12.0.400.g54ad2d445.dirty