# [PATCH] bisect: debug: convert struct object to object_id 3 messages from 2018-01-09 to 2018-01-11. Participants: Yasushi SHOJI, Junio C Hamano, brian m. carlson. Thread: https://gitlist.dev/t/47572 ## Yasushi SHOJI, 2018-01-09 11:03 Subject: [PATCH] bisect: debug: convert struct object to object_id Message-ID: <20180109110356.25824-1-yasushi.shoji@gmail.com> URL: https://gitlist.dev/e/20180109110356.25824-1-yasushi.shoji%40gmail.com ``` The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct object to object_id but a debug function show_list(), which is ifdef'ed to noop, in bisect.c wasn't. So fix it. Signed-off-by: Yasushi SHOJI --- bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index 3756f127b..0dd0f289a 100644 --- a/bisect.c +++ b/bisect.c @@ -132,7 +132,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; @@ -144,10 +144,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.15.1 ``` ## Junio C Hamano, 2018-01-09 18:57 Subject: Re: [PATCH] bisect: debug: convert struct object to object_id Message-ID: URL: https://gitlist.dev/e/xmqqr2qy6esi.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20180109110356.25824-1-yasushi.shoji@gmail.com> ``` Yasushi SHOJI writes: > The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct > object to object_id but a debug function show_list(), which is > ifdef'ed to noop, in bisect.c wasn't. > > So fix it. > > Signed-off-by: Yasushi SHOJI > --- Thanks. That's quite an old breakage ;-) > bisect.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/bisect.c b/bisect.c > index 3756f127b..0dd0f289a 100644 > --- a/bisect.c > +++ b/bisect.c > @@ -132,7 +132,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; > > @@ -144,10 +144,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) ``` ## brian m. carlson, 2018-01-11 02:08 Subject: Re: [PATCH] bisect: debug: convert struct object to object_id Message-ID: <20180111020834.GB5946@genre.crustytoothpaste.net> URL: https://gitlist.dev/e/20180111020834.GB5946%40genre.crustytoothpaste.net In-Reply-To: <20180109110356.25824-1-yasushi.shoji@gmail.com> ``` On Tue, Jan 09, 2018 at 08:03:56PM +0900, Yasushi SHOJI wrote: > The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct > object to object_id but a debug function show_list(), which is > ifdef'ed to noop, in bisect.c wasn't. > > So fix it. Thanks. This is obviously the right change to make. -- brian m. carlson / brian with sandals: Houston, Texas, US https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: https://keybase.io/bk2204 ```