Skip to content

Commit 38e79b1

Browse files
committed
Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint
Fix for a commented-out code to adjust it to a rather old API change. * ys/bisect-object-id-missing-conversion-fix: bisect: debug: convert struct object to object_id
2 parents 14890e9 + f0a6068 commit 38e79b1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bisect.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static void show_list(const char *debug, int counted, int nr,
132132
unsigned flags = commit->object.flags;
133133
enum object_type type;
134134
unsigned long size;
135-
char *buf = read_sha1_file(commit->object.sha1, &type, &size);
135+
char *buf = read_sha1_file(commit->object.oid.hash, &type, &size);
136136
const char *subject_start;
137137
int subject_len;
138138

@@ -144,10 +144,10 @@ static void show_list(const char *debug, int counted, int nr,
144144
fprintf(stderr, "%3d", weight(p));
145145
else
146146
fprintf(stderr, "---");
147-
fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1));
147+
fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash));
148148
for (pp = commit->parents; pp; pp = pp->next)
149149
fprintf(stderr, " %.*s", 8,
150-
sha1_to_hex(pp->item->object.sha1));
150+
sha1_to_hex(pp->item->object.oid.hash));
151151

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

0 commit comments

Comments
 (0)