summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasushi SHOJI <yasushi.shoji@gmail.com>2018-01-09 11:03:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-09 18:55:32 (GMT)
commitf0a6068a9f3377a209c43282831e338d10aaf152 (patch)
treeb0e4296c302354bd7a32339d42c5545d1ec41e25
parent9752ad0bb79f680bca48db7adc45338b298304b0 (diff)
downloadgit-f0a6068a9f3377a209c43282831e338d10aaf152.zip
git-f0a6068a9f3377a209c43282831e338d10aaf152.tar.gz
git-f0a6068a9f3377a209c43282831e338d10aaf152.tar.bz2
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>
-rw-r--r--bisect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bisect.c b/bisect.c
index 30808ca..6feed85 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, 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)