diff options
author | Stephan Beyer <s-beyer@gmx.net> | 2016-04-10 15:19:01 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-15 12:27:29 -0700 |
commit | 4d1b572b8a8292b8af1086cd22287e7831fde05f (patch) | |
tree | 5b6ee949c9237bf10ad31f3138ff959ed126db57 | |
parent | 9a95495a9805f884bf736a7d8246cd79c135b6b6 (diff) | |
download | git-4d1b572b8a8292b8af1086cd22287e7831fde05f.tar.gz |
bisect: make bisect compile if DEBUG_BISECT is set
Setting the macro DEBUG_BISECT to 1 enables debugging information
for the bisect algorithm. The code did not compile due to struct
changes.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
-rw-r--r-- | bisect.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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) |