From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Stefan Beller <sbeller@google.com>
Cc: Alex Hoffman <spec@gal.ro>, git <git@vger.kernel.org>
Subject: Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms
Date: Mon, 20 Mar 2017 22:14:29 +0000 [thread overview]
Message-ID: <20170320221429.qefqowtwe2ptvgdg@genre.crustytoothpaste.net> (raw)
In-Reply-To: <CAGZ79kY1g-4c+GXZy3p-q=MsBY94esxsfs2=OPuhOH_o5oGc_Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2131 bytes --]
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@gal.ro> 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 #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 868 bytes --]
next prev parent reply other threads:[~2017-03-20 22:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-19 21:33 [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms Alex Hoffman
2017-03-20 18:11 ` Stefan Beller
2017-03-20 22:14 ` brian m. carlson [this message]
2017-03-21 21:24 ` Alex Hoffman
2017-03-29 20:02 ` Alex Hoffman
2017-03-29 21:36 ` Stephan Beyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170320221429.qefqowtwe2ptvgdg@genre.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
--cc=spec@gal.ro \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).