threads / patch / 47572

patchbisect: debug: convert struct object to object_id

Subject: [PATCH] bisect: debug: convert struct object to object_id

## tl;dr

3 messages between Jan 9, 2018 and Jan 11, 2018. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Yasushi SHOJI· Jan 9, 2018, 11:03 UTC · lore

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 <Yasushi.SHOJI@gmail.com>
---
 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 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· Jan 9, 2018, 18:57 UTC · re: Yasushi SHOJI · lore

Re: [PATCH] bisect: debug: convert struct object to object_id

Yasushi SHOJI <yasushi.shoji@gmail.com> writes:

Show 8 quoted lines

> 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 <Yasushi.SHOJI@gmail.com>
> ---

Thanks.  That's quite an old breakage ;-)

Show 29 quoted lines

>  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· Jan 11, 2018, 02:08 UTC · re: Yasushi SHOJI · lore

Re: [PATCH] bisect: debug: convert struct object to object_id

On Tue, Jan 09, 2018 at 08:03:56PM +0900, Yasushi SHOJI wrote:

Show 5 quoted lines

> 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