git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
* [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms
@ 2017-03-19 21:33 Alex Hoffman
  2017-03-20 18:11 ` Stefan Beller
  0 siblings, 1 reply; 4+ messages in thread
From: Alex Hoffman @ 2017-03-19 21:33 UTC (permalink / raw)
  To: git

---
 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

^ permalink raw reply	[flat|threaded] 4+ messages in thread

* Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms
  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
  0 siblings, 1 reply; 4+ messages in thread
From: Stefan Beller @ 2017-03-20 18:11 UTC (permalink / raw)
  To: Alex Hoffman, brian m. carlson; +Cc: git

+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));
>                 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

^ permalink raw reply	[flat|threaded] 4+ messages in thread

* Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms
  2017-03-20 18:11 ` Stefan Beller
@ 2017-03-20 22:14   ` brian m. carlson
  2017-03-21 21:24     ` Alex Hoffman
  0 siblings, 1 reply; 4+ messages in thread
From: brian m. carlson @ 2017-03-20 22:14 UTC (permalink / raw)
  To: Stefan Beller; +Cc: Alex Hoffman, git

[-- 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 --]

^ permalink raw reply	[flat|threaded] 4+ messages in thread

* Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms
  2017-03-20 22:14   ` brian m. carlson
@ 2017-03-21 21:24     ` Alex Hoffman
  0 siblings, 0 replies; 4+ messages in thread
From: Alex Hoffman @ 2017-03-21 21:24 UTC (permalink / raw)
  To: brian m. carlson, Stefan Beller, Alex Hoffman, git

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

^ permalink raw reply	[flat|threaded] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2017-03-21 21:24     ` Alex Hoffman

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox