On Mon, Mar 20, 2017 at 11:11:17AM -0700, Stefan Beller wrote: > +cc Brian > > On Sun, Mar 19, 2017 at 2:33 PM, Alex Hoffman <spec@xxxxxx> wrote: > > --- > > bisect.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/bisect.c b/bisect.c > > index 30808cadf..6feed8533 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)); I think here we want to write fprintf(stderr, " %.*s", 8, oid_to_hex(&commit->object.oid)); > > 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)); And here, as well. > > > > subject_len = find_commit_subject(buf, &subject_start); > > if (subject_len) Otherwise, I think this looks good. I'm sorry I didn't catch this earlier, but I didn't even realize we had this option, or I would have tested it. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204
Attachment:
signature.asc
Description: PGP signature