threads / patch / 45434

patchCorrect compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

Subject: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

## tl;dr

6 messages between Mar 19, 2017 and Mar 29, 2017. Diffs are folded; open one to read it.

replies: 5people: 4as markdown or json

Alex Hoffman· Mar 19, 2017, 21:33 UTC · lore
---
 bisect.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Show changes to bisect.c +3 −3
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· Mar 20, 2017, 18:11 UTC · re: Alex Hoffman · lore

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

+cc Brian
On Sun, Mar 19, 2017 at 2:33 PM, Alex Hoffman <spec@gal.ro> wrote:
Show 36 quoted lines
> ---
>  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· Mar 20, 2017, 22:14 UTC · re: Stefan Beller · lore

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

On Mon, Mar 20, 2017 at 11:11:17AM -0700, Stefan Beller wrote:
Show 30 quoted lines
> +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
Alex Hoffman· Mar 21, 2017, 21:24 UTC · re: brian m. carlson · lore

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

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(-)
Show changes to bisect.c +3 −3
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· Mar 29, 2017, 20:02 UTC · re: Alex Hoffman · lore

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

Any news about this patch?
2017-03-21 22:24 GMT+01:00 Alex Hoffman <spec@gal.ro>:
Show 41 quoted lines
> 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· Mar 29, 2017, 21:36 UTC · re: Alex Hoffman · lore

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

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

← back to recent threads