{"thread":{"id":"49455","subject":"[PATCH] config.txt: correct the note about uploadpack.packObjectsHook","startedAt":"2018-09-29T06:52:40Z","lastAt":"2018-09-29T06:58:53Z","messageCount":2,"participants":["Nguyễn Thái Ngọc Duy","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"359271","messageId":"20180929065056.9960-1-pclouds@gmail.com","threadId":"49455","inReplyTo":null,"subject":"[PATCH] config.txt: correct the note about uploadpack.packObjectsHook","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2018-09-29T06:50:56Z","receivedAt":"2018-09-29T06:52:40Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Document for uploadpack.packObjectsHook is added in [1] and consists\nof two paragraphs, the second one is quite important about where this\nvariable can stay.\n\nWhen the paragraph about uploadpack.allowFilter is added in [2], it's\nadded in between the two paragraphs. This makes the \"this is non-repo\nlevel config\" note incorrectly apply to allowFilter instead of\npackObjectsHook. Move allowFilter paragraph down to fix this.\n\n[1] 20b20a22f8 (upload-pack: provide a hook for running pack-objects -\n    2016-05-18)\n\n[2] 10ac85c785 (upload-pack: add object filtering for partial clone -\n    2017-12-08)\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n Documentation/config.txt | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex ad0f4510c3..907b1d0cb9 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -3666,15 +3666,15 @@ uploadpack.packObjectsHook::\n \twas run. I.e., `upload-pack` will feed input intended for\n \t`pack-objects` to the hook, and expects a completed packfile on\n \tstdout.\n-\n-uploadpack.allowFilter::\n-\tIf this option is set, `upload-pack` will support partial\n-\tclone and partial fetch object filtering.\n +\n Note that this configuration variable is ignored if it is seen in the\n repository-level config (this is a safety measure against fetching from\n untrusted repositories).\n \n+uploadpack.allowFilter::\n+\tIf this option is set, `upload-pack` will support partial\n+\tclone and partial fetch object filtering.\n+\n uploadpack.allowRefInWant::\n \tIf this option is set, `upload-pack` will support the `ref-in-want`\n \tfeature of the protocol version 2 `fetch` command.  This feature\n-- \n2.19.0.341.g3acb95d729\n\n"},{"id":"359272","messageId":"20180929065849.GA2174@sigill.intra.peff.net","threadId":"49455","inReplyTo":"20180929065056.9960-1-pclouds@gmail.com","subject":"Re: [PATCH] config.txt: correct the note about uploadpack.packObjectsHook","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2018-09-29T06:58:49Z","receivedAt":"2018-09-29T06:58:53Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Sep 29, 2018 at 08:50:56AM +0200, Nguyễn Thái Ngọc Duy wrote:\n\n> Document for uploadpack.packObjectsHook is added in [1] and consists\n> of two paragraphs, the second one is quite important about where this\n> variable can stay.\n> \n> When the paragraph about uploadpack.allowFilter is added in [2], it's\n> added in between the two paragraphs. This makes the \"this is non-repo\n> level config\" note incorrectly apply to allowFilter instead of\n> packObjectsHook. Move allowFilter paragraph down to fix this.\n\nNice catch, and the patch looks obviously correct. Thanks.\n\n-Peff\n"}]}