{"thread":{"id":"48508","subject":"[PATCH] shallow: remove unused variable","startedAt":"2018-05-16T22:10:43Z","lastAt":"2018-05-16T22:19:17Z","messageCount":2,"participants":["Ramsay Jones","Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"347833","messageId":"ae96f1c4-add2-d9d8-f08b-a765fe277232@ramsayjones.plus.com","threadId":"48508","inReplyTo":null,"subject":"[PATCH] shallow: remove unused variable","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2018-05-16T22:10:38Z","receivedAt":"2018-05-16T22:10:43Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSigned-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>\n---\n\nHi Stefan,\n\nIf you need to re-roll your 'sb/object-store-grafts' branch, could\nyou please squash this into the relevant patch (whichever one that\nwould be)! ;-)\n\nI have not looked to see which patch needs to change (just being\nlazy, sorry!), but this variable was introduced by commit d73b49b707\n(\"shallow: migrate shallow information into the object parser\", 2018-05-15).\n\nThat commit seems to rename the 'shallow_stat' symbol to the 'the_repository_shallow_stat' symbol, but at the same time adds an 'shallow_stat' field to the parsed_object_pool struct, so ... :(\n\nThanks!\n\nATB,\nRamsay Jones\n\n shallow.c | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/shallow.c b/shallow.c\nindex 74bc78801..51447608a 100644\n--- a/shallow.c\n+++ b/shallow.c\n@@ -17,8 +17,6 @@\n #include \"commit-slab.h\"\n #include \"repository.h\"\n \n-struct stat_validity the_repository_shallow_stat;\n-\n void set_alternate_shallow_file(struct repository *r, const char *path, int override)\n {\n \tif (r->parsed_objects->is_shallow != -1)\n-- \n2.17.0\n"},{"id":"347834","messageId":"CAGZ79kadJpWvgmLyO-=mk_bdGFvgjdOa=mZqPPTNctxCMkRFvg@mail.gmail.com","threadId":"48508","inReplyTo":"ae96f1c4-add2-d9d8-f08b-a765fe277232@ramsayjones.plus.com","subject":"Re: [PATCH] shallow: remove unused variable","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-05-16T22:19:12Z","receivedAt":"2018-05-16T22:19:17Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Hi Ramsay,\n\n> That commit seems to rename the 'shallow_stat' symbol to the 'the_repository_shallow_stat' symbol, but at the same time adds an 'shallow_stat' field to the parsed_object_pool struct, so ... :(\n\nThanks for catching this! it shows again, how rebase can be a\ndangerous tool if not used properly.\nI'll look into this, and the solution most likely will be to squash\nthis patch into that commit.\n\nThanks!\nStefan\n"}]}