Skip to content

Commit f0a6068

Browse files
yashigitster
authored andcommitted
bisect: debug: convert struct object to object_id
The commit f2fd076 ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9752ad0 commit f0a6068

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
@@ -131,7 +131,7 @@ static void show_list(const char *debug, int counted, int nr,
131131
unsigned flags = commit->object.flags;
132132
enum object_type type;
133133
unsigned long size;
134-
char *buf = read_sha1_file(commit->object.sha1, &type, &size);
134+
char *buf = read_sha1_file(commit->object.oid.hash, &type, &size);
135135
const char *subject_start;
136136
int subject_len;
137137

@@ -143,10 +143,10 @@ static void show_list(const char *debug, int counted, int nr,
143143
fprintf(stderr, "%3d", weight(p));
144144
else
145145
fprintf(stderr, "---");
146-
fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1));
146+
fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash));
147147
for (pp = commit->parents; pp; pp = pp->next)
148148
fprintf(stderr, " %.*s", 8,
149-
sha1_to_hex(pp->item->object.sha1));
149+
sha1_to_hex(pp->item->object.oid.hash));
150150

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

0 commit comments

Comments
 (0)