summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-27 18:43:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-27 18:43:55 (GMT)
commit38e79b1fdab9244e1727d0698afcf3bb8956c0a4 (patch)
tree6c89b8e757f0206366b1f613eea3551b39a2ec15
parent14890e916fca7d903332f9fed7fb36fb5715acb1 (diff)
parentf0a6068a9f3377a209c43282831e338d10aaf152 (diff)
downloadgit-38e79b1fdab9244e1727d0698afcf3bb8956c0a4.zip
git-38e79b1fdab9244e1727d0698afcf3bb8956c0a4.tar.gz
git-38e79b1fdab9244e1727d0698afcf3bb8956c0a4.tar.bz2
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
-rw-r--r--bisect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bisect.c b/bisect.c
index 0d9e731..f6d05bd 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)