{"thread":{"id":"38283","subject":"[PATCH] clean: style fix for 9f93e46 (git-clean: use a git-add-interactive ...)","startedAt":"2015-01-05T13:29:23Z","lastAt":"2015-01-07T12:35:44Z","messageCount":3,"participants":["Nguyễn Thái Ngọc Duy","Junio C Hamano","Duy Nguyen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"254291","messageId":"1420464563-5579-1-git-send-email-pclouds@gmail.com","threadId":"38283","inReplyTo":null,"subject":"[PATCH] clean: style fix for 9f93e46 (git-clean: use a git-add-interactive ...)","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2015-01-05T13:29:23Z","receivedAt":"2015-01-05T13:29:23Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"From: Junio C Hamano \n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n This is in the SQUASH??? commit on nd/untracked-cache on 'pu', but it\n fixes a commit older than that series.\n\n builtin/clean.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/clean.c b/builtin/clean.c\nindex 1032563..3beeea6 100644\n--- a/builtin/clean.c\n+++ b/builtin/clean.c\n@@ -67,7 +67,7 @@ struct menu_item {\n \tchar hotkey;\n \tconst char *title;\n \tint selected;\n-\tint (*fn)();\n+\tint (*fn)(void);\n };\n \n enum menu_stuff_type {\n-- \n2.2.0.84.ge9c7a8a\n"},{"id":"254360","messageId":"xmqq4ms3pvle.fsf@gitster.dls.corp.google.com","threadId":"38283","inReplyTo":"1420464563-5579-1-git-send-email-pclouds@gmail.com","subject":"Re: [PATCH] clean: style fix for 9f93e46 (git-clean: use a git-add-interactive ...)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-06T19:17:33Z","receivedAt":"2015-01-06T19:17:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nguyễn Thái Ngọc Duy writes:\n\n> -\tint (*fn)();\n> +\tint (*fn)(void);\n\nThis is an independent fix that has already been merged to 'maint',\nbut to any topic that forked before the merge happened I need to\napply the fix without committing it when I test it in isolation, and\nI screwed up when I did that SQUASH??? in question by running a\ncasual \"commit -a\" (or perhaps \"add -u\"). My bad.\n\nWhen your series (with the squash) is merged to any integration\nbranch, this hunk becomes redundant, so I'd remove it from the\nSQUASH???\n\nWhen I do a SQUASH???, I expect the original authors use it as a\nhint in their rerolls, but because this series has seen no comments\nso far (no interests???), I do not foresee or expect you to feel a\nneed for rerolling at this point. If you agree that the remainder\nof the SQUASH??? (shown below) is sensible, I'll turn it into a\n\"fixup!\" for cc44d4fe (untracked cache: load from UNTR index\nextension, 2014-12-08) and requeue.\n\nThanks for catching my mistake before it gets too old.\n\n dir.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/dir.c b/dir.c\nindex ef58547..95ff3f0 100644\n--- a/dir.c\n+++ b/dir.c\n@@ -2459,7 +2459,7 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long\n \tconst struct ondisk_untracked_cache *ouc;\n \tstruct untracked_cache *uc;\n \tstruct read_data rd;\n-\tconst unsigned char *next = data, *end = data + sz;\n+\tconst unsigned char *next = data, *end = (const unsigned char *)data + sz;\n \tstruct strbuf sb = STRBUF_INIT;\n \tint len;\n \n"},{"id":"254398","messageId":"CACsJy8BdQtbLMJ1EmS+i2TzZYaGbZ-PAkB3CPdFOjZtE13LN+g@mail.gmail.com","threadId":"38283","inReplyTo":"xmqq4ms3pvle.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] clean: style fix for 9f93e46 (git-clean: use a git-add-interactive ...)","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2015-01-07T12:35:44Z","receivedAt":"2015-01-07T12:35:44Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Wed, Jan 7, 2015 at 2:17 AM, Junio C Hamano wrote:\n> When I do a SQUASH???, I expect the original authors use it as a\n> hint in their rerolls, but because this series has seen no comments\n> so far (no interests???), I do not foresee or expect you to feel a\n> need for rerolling at this point. If you agree that the remainder\n> of the SQUASH??? (shown below) is sensible, I'll turn it into a\n> \"fixup!\" for cc44d4fe (untracked cache: load from UNTR index\n> extension, 2014-12-08) and requeue.\n\nNo there will be a reroll. I was going through the comments and this\nis the easiest piece. Glad to hear it's already in 'maint'. The\nremaining change in your SQUASH??? will be squashed in the right\npatch.\n-- \nDuy\n"}]}