{"thread":{"id":"47572","subject":"[PATCH] bisect: debug: convert struct object to object_id","startedAt":"2018-01-09T11:12:21Z","lastAt":"2018-01-11T02:08:54Z","messageCount":3,"participants":["Yasushi SHOJI","Junio C Hamano","brian m. carlson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"336227","messageId":"20180109110356.25824-1-yasushi.shoji@gmail.com","threadId":"47572","inReplyTo":null,"subject":"[PATCH] bisect: debug: convert struct object to object_id","fromName":"Yasushi SHOJI","fromEmail":"yasushi.shoji@gmail.com","sentAt":"2018-01-09T11:03:56Z","receivedAt":"2018-01-09T11:12:21Z","isPatch":true,"sender":{"key":"yasushi.shoji@gmail.com","avatar":"https://avatars.githubusercontent.com/u/10152?v=4"},"body":"The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct\nobject to object_id but a debug function show_list(), which is\nifdef'ed to noop, in bisect.c wasn't.\n\nSo fix it.\n\nSigned-off-by: Yasushi SHOJI <Yasushi.SHOJI@gmail.com>\n---\n bisect.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/bisect.c b/bisect.c\nindex 3756f127b..0dd0f289a 100644\n--- a/bisect.c\n+++ b/bisect.c\n@@ -132,7 +132,7 @@ static void show_list(const char *debug, int counted, int nr,\n \t\tunsigned flags = commit->object.flags;\n \t\tenum object_type type;\n \t\tunsigned long size;\n-\t\tchar *buf = read_sha1_file(commit->object.sha1, &type, &size);\n+\t\tchar *buf = read_sha1_file(commit->object.oid.hash, &type, &size);\n \t\tconst char *subject_start;\n \t\tint subject_len;\n \n@@ -144,10 +144,10 @@ static void show_list(const char *debug, int counted, int nr,\n \t\t\tfprintf(stderr, \"%3d\", weight(p));\n \t\telse\n \t\t\tfprintf(stderr, \"---\");\n-\t\tfprintf(stderr, \" %.*s\", 8, sha1_to_hex(commit->object.sha1));\n+\t\tfprintf(stderr, \" %.*s\", 8, sha1_to_hex(commit->object.oid.hash));\n \t\tfor (pp = commit->parents; pp; pp = pp->next)\n \t\t\tfprintf(stderr, \" %.*s\", 8,\n-\t\t\t\tsha1_to_hex(pp->item->object.sha1));\n+\t\t\t\tsha1_to_hex(pp->item->object.oid.hash));\n \n \t\tsubject_len = find_commit_subject(buf, &subject_start);\n \t\tif (subject_len)\n-- \n2.15.1\n\n"},{"id":"336291","messageId":"xmqqr2qy6esi.fsf@gitster.mtv.corp.google.com","threadId":"47572","inReplyTo":"20180109110356.25824-1-yasushi.shoji@gmail.com","subject":"Re: [PATCH] bisect: debug: convert struct object to object_id","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-01-09T18:57:33Z","receivedAt":"2018-01-09T18:57:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Yasushi SHOJI <yasushi.shoji@gmail.com> writes:\n\n> The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct\n> object to object_id but a debug function show_list(), which is\n> ifdef'ed to noop, in bisect.c wasn't.\n>\n> So fix it.\n>\n> Signed-off-by: Yasushi SHOJI <Yasushi.SHOJI@gmail.com>\n> ---\n\nThanks.  That's quite an old breakage ;-)\n\n\n\n>  bisect.c | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/bisect.c b/bisect.c\n> index 3756f127b..0dd0f289a 100644\n> --- a/bisect.c\n> +++ b/bisect.c\n> @@ -132,7 +132,7 @@ static void show_list(const char *debug, int counted, int nr,\n>  \t\tunsigned flags = commit->object.flags;\n>  \t\tenum object_type type;\n>  \t\tunsigned long size;\n> -\t\tchar *buf = read_sha1_file(commit->object.sha1, &type, &size);\n> +\t\tchar *buf = read_sha1_file(commit->object.oid.hash, &type, &size);\n>  \t\tconst char *subject_start;\n>  \t\tint subject_len;\n>  \n> @@ -144,10 +144,10 @@ static void show_list(const char *debug, int counted, int nr,\n>  \t\t\tfprintf(stderr, \"%3d\", weight(p));\n>  \t\telse\n>  \t\t\tfprintf(stderr, \"---\");\n> -\t\tfprintf(stderr, \" %.*s\", 8, sha1_to_hex(commit->object.sha1));\n> +\t\tfprintf(stderr, \" %.*s\", 8, sha1_to_hex(commit->object.oid.hash));\n>  \t\tfor (pp = commit->parents; pp; pp = pp->next)\n>  \t\t\tfprintf(stderr, \" %.*s\", 8,\n> -\t\t\t\tsha1_to_hex(pp->item->object.sha1));\n> +\t\t\t\tsha1_to_hex(pp->item->object.oid.hash));\n>  \n>  \t\tsubject_len = find_commit_subject(buf, &subject_start);\n>  \t\tif (subject_len)\n"},{"id":"336440","messageId":"20180111020834.GB5946@genre.crustytoothpaste.net","threadId":"47572","inReplyTo":"20180109110356.25824-1-yasushi.shoji@gmail.com","subject":"Re: [PATCH] bisect: debug: convert struct object to object_id","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-01-11T02:08:35Z","receivedAt":"2018-01-11T02:08:54Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Tue, Jan 09, 2018 at 08:03:56PM +0900, Yasushi SHOJI wrote:\n> The commit f2fd0760f62e79609fef7bfd7ecebb002e8e4ced converted struct\n> object to object_id but a debug function show_list(), which is\n> ifdef'ed to noop, in bisect.c wasn't.\n> \n> So fix it.\n\nThanks.  This is obviously the right change to make.\n-- \nbrian m. carlson / brian with sandals: Houston, Texas, US\nhttps://www.crustytoothpaste.net/~bmc | My opinion only\nOpenPGP: https://keybase.io/bk2204\n"}]}