# [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms 6 messages from 2017-03-19 to 2017-03-29. Participants: Alex Hoffman, Stefan Beller, brian m. carlson, Stephan Beyer. Thread: https://gitlist.dev/t/45434 ## Alex Hoffman, 2017-03-19 21:33 Subject: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms Message-ID: URL: https://gitlist.dev/e/CAMX8fZU-HeKzd8VYh8R%3DU8f8V-px%2B4V%3D%3DM3CJSS677K0ErwPtA%40mail.gmail.com ``` --- 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)); 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) -- 2.12.0.399.g9d77b0405.dirty ``` ## Stefan Beller, 2017-03-20 18:11 Subject: Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms Message-ID: URL: https://gitlist.dev/e/CAGZ79kY1g-4c%2BGXZy3p-q%3DMsBY94esxsfs2%3DOPuhOH_o5oGc_Q%40mail.gmail.com In-Reply-To: ``` +cc Brian On Sun, Mar 19, 2017 at 2:33 PM, Alex Hoffman 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)); > 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) > -- > 2.12.0.399.g9d77b0405.dirty ``` ## brian m. carlson, 2017-03-20 22:14 Subject: Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms Message-ID: <20170320221429.qefqowtwe2ptvgdg@genre.crustytoothpaste.net> URL: https://gitlist.dev/e/20170320221429.qefqowtwe2ptvgdg%40genre.crustytoothpaste.net In-Reply-To: ``` 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 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 ``` ## Alex Hoffman, 2017-03-21 21:24 Subject: Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms Message-ID: URL: https://gitlist.dev/e/CAMX8fZXqTfKQXxV_pZEieN%3D1ap8ocVnnwZUvpGuw5rWo5_Yhfg%40mail.gmail.com In-Reply-To: <20170320221429.qefqowtwe2ptvgdg@genre.crustytoothpaste.net> ``` Hi, Brian, We definitely prefer the wrapper function oid_to_hex() to sha1_to_hex(). Thanks for feedback. Below is the updated patch: --- bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index 30808cadf..7b65acbcd 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, 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)); + oid_to_hex(&pp->item->object.oid)); subject_len = find_commit_subject(buf, &subject_start); if (subject_len) -- 2.12.0.400.g54ad2d445.dirty ``` ## Alex Hoffman, 2017-03-29 20:02 Subject: Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms Message-ID: URL: https://gitlist.dev/e/CAMX8fZXS4k5chezESM4pcaSfhG6WZ4xKxsWB0fpm4h-PQGjXwQ%40mail.gmail.com In-Reply-To: ``` Any news about this patch? 2017-03-21 22:24 GMT+01:00 Alex Hoffman : > Hi, Brian, > > We definitely prefer the wrapper function oid_to_hex() to > sha1_to_hex(). Thanks for feedback. > Below is the updated patch: > > --- > bisect.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/bisect.c b/bisect.c > index 30808cadf..7b65acbcd 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, 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)); > + oid_to_hex(&pp->item->object.oid)); > > subject_len = find_commit_subject(buf, &subject_start); > if (subject_len) > -- > 2.12.0.400.g54ad2d445.dirty ``` ## Stephan Beyer, 2017-03-29 21:36 Subject: Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms Message-ID: <52ac188d-1112-758e-5d02-470afc6ffa8d@gmx.net> URL: https://gitlist.dev/e/52ac188d-1112-758e-5d02-470afc6ffa8d%40gmx.net In-Reply-To: ``` Hi, On 03/29/2017 10:02 PM, Alex Hoffman wrote: > Any news about this patch? Haha nice, your initial patch is the same as mine (but mine was part of a bigger patch series and the v3 is probably going to have one less commit): https://public-inbox.org/git/1456452282-10325-4-git-send-email-s-beyer@gmx.net/ >> for (pp = commit->parents; pp; pp = pp->next) >> fprintf(stderr, " %.*s", 8, >> - sha1_to_hex(pp->item->object.sha1)); >> + oid_to_hex(&pp->item->object.oid)); I guess your change in continued indentation is intentional, but is it just my mail client or do you f*ck up tabs? (I haven't tried to apply the patch but it looks like it is not possible due to broken tabs.) Stephan ```