{"thread":{"id":"62954","subject":"[PATCH 0/2] Documentation: fixups following followRemoteHEAD","startedAt":"2025-02-14T17:36:22Z","lastAt":"2025-02-25T02:55:18Z","messageCount":7,"participants":["Philippe Blain via GitGitGadget","Bence Ferdinandy","Junio C Hamano","Philippe Blain"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"512429","messageId":"pull.1894.git.git.1739554578.gitgitgadget@gmail.com","threadId":"62954","inReplyTo":null,"subject":"[PATCH 0/2] Documentation: fixups following followRemoteHEAD","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-02-14T17:36:16Z","receivedAt":"2025-02-14T17:36:22Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"A small fixup and a wording improvement for the documentation of\nremote..followRemoteHEAD.\n\nBence, thanks a lot for this new option, it is something I've been wanting\nfor a long time!\n\nPhilippe Blain (2):\n config/remote.txt: reunite 'severOption' description paragraphs\n config/remote.txt: improve wording for\n 'remote..followRemoteHEAD'\n\n Documentation/config/remote.txt | 22 +++++++++++-----------\n 1 file changed, 11 insertions(+), 11 deletions(-)\n\n\nbase-commit: e2067b49ecaef9b7f51a17ce251f9207f72ef52d\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1894%2Fphil-blain%2Ffollow-remote-head-doc-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1894/phil-blain/follow-remote-head-doc-v1\nPull-Request: https://github.com/git/git/pull/1894\n-- \ngitgitgadget\n"},{"id":"512430","messageId":"cc2e59ca0475ea2d4f2df7784d5a4c81a70c264c.1739554578.git.gitgitgadget@gmail.com","threadId":"62954","inReplyTo":"pull.1894.git.git.1739554578.gitgitgadget@gmail.com","subject":"[PATCH 1/2] config/remote.txt: reunite 'severOption' description paragraphs","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-02-14T17:36:17Z","receivedAt":"2025-02-14T17:36:23Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nWhen 'remote..followRemoteHEAD' was added in b7f7d16562 (fetch:\nadd configuration for set_head behaviour, 2024-11-29), its description\nwas added to remote.txt in between the two paragraphs describing\n'remote..serverOption'. Reunite these two paragraphs.\n\nSigned-off-by: Philippe Blain \n---\n Documentation/config/remote.txt | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt\nindex 4118c219c13..1b9814e8aa4 100644\n--- a/Documentation/config/remote.txt\n+++ b/Documentation/config/remote.txt\n@@ -101,6 +101,11 @@ remote..serverOption::\n \tThe default set of server options used when fetching from this remote.\n \tThese server options can be overridden by the `--server-option=` command\n \tline arguments.\n++\n+This is a multi-valued variable, and an empty value can be used in a higher\n+priority configuration file (e.g. `.git/config` in a repository) to clear\n+the values inherited from a lower priority configuration files (e.g.\n+`$HOME/.gitconfig`).\n \n remote..followRemoteHEAD::\n \tHow linkgit:git-fetch[1] should handle updates to `remotes//HEAD`.\n@@ -114,8 +119,3 @@ remote..followRemoteHEAD::\n \tSetting to \"always\" will silently update it to the value on the remote.\n \tFinally, setting it to \"never\" will never change or create the local\n \treference.\n-+\n-This is a multi-valued variable, and an empty value can be used in a higher\n-priority configuration file (e.g. `.git/config` in a repository) to clear\n-the values inherited from a lower priority configuration files (e.g.\n-`$HOME/.gitconfig`).\n-- \ngitgitgadget\n\n"},{"id":"512431","messageId":"140794b8846e94ec3ff77920f0153f65d434f07e.1739554578.git.gitgitgadget@gmail.com","threadId":"62954","inReplyTo":"pull.1894.git.git.1739554578.gitgitgadget@gmail.com","subject":"[PATCH 2/2] config/remote.txt: improve wording for 'remote..followRemoteHEAD'","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-02-14T17:36:18Z","receivedAt":"2025-02-14T17:36:24Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSigned-off-by: Philippe Blain \n---\n Documentation/config/remote.txt | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt\nindex 1b9814e8aa4..25fe219d103 100644\n--- a/Documentation/config/remote.txt\n+++ b/Documentation/config/remote.txt\n@@ -110,12 +110,12 @@ the values inherited from a lower priority configuration files (e.g.\n remote..followRemoteHEAD::\n \tHow linkgit:git-fetch[1] should handle updates to `remotes//HEAD`.\n \tThe default value is \"create\", which will create `remotes//HEAD`\n-\tif it exists on the remote, but not locally, but will not touch an\n-\talready existing local reference. Setting to \"warn\" will print\n-\ta message if the remote has a different value, than the local one and\n+\tif it exists on the remote, but not locally; this will not touch an\n+\talready existing local reference. Setting it to \"warn\" will print\n+\ta message if the remote has a different value than the local one;\n \tin case there is no local reference, it behaves like \"create\".\n \tA variant on \"warn\" is \"warn-if-not-$branch\", which behaves like\n \t\"warn\", but if `HEAD` on the remote is `$branch` it will be silent.\n-\tSetting to \"always\" will silently update it to the value on the remote.\n-\tFinally, setting it to \"never\" will never change or create the local\n-\treference.\n+\tSetting it to \"always\" will silently update `remotes//HEAD` to\n+\tthe value on the remote. Finally, setting it to \"never\" will never\n+\tchange or create the local reference.\n-- \ngitgitgadget\n"},{"id":"512442","messageId":"D7SI9UARORGX.15QZAD6410YTA@ferdinandy.com","threadId":"62954","inReplyTo":"cc2e59ca0475ea2d4f2df7784d5a4c81a70c264c.1739554578.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/2] config/remote.txt: reunite 'severOption' description paragraphs","fromName":"Bence Ferdinandy","fromEmail":"bence@ferdinandy.com","sentAt":"2025-02-14T22:01:29Z","receivedAt":"2025-02-14T22:07:57Z","isPatch":true,"sender":{"key":"bence@ferdinandy.com","avatar":"https://avatars.githubusercontent.com/u/6343487?v=4"},"body":"\nOn Fri Feb 14, 2025 at 18:36, Philippe Blain via GitGitGadget wrote:\n> From: Philippe Blain \n>\n> When 'remote..followRemoteHEAD' was added in b7f7d16562 (fetch:\n> add configuration for set_head behaviour, 2024-11-29), its description\n> was added to remote.txt in between the two paragraphs describing\n> 'remote..serverOption'. Reunite these two paragraphs.\n>\n> Signed-off-by: Philippe Blain \n> ---\n\nAuch, that was sloppy. Thanks for cleaning up the mistake!\n"},{"id":"512443","messageId":"xmqqy0y8jhxk.fsf@gitster.g","threadId":"62954","inReplyTo":"cc2e59ca0475ea2d4f2df7784d5a4c81a70c264c.1739554578.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/2] config/remote.txt: reunite 'severOption' description paragraphs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-02-14T22:11:03Z","receivedAt":"2025-02-14T22:11:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Philippe Blain via GitGitGadget\" writes:\n\n> From: Philippe Blain \n>\n> When 'remote..followRemoteHEAD' was added in b7f7d16562 (fetch:\n> add configuration for set_head behaviour, 2024-11-29), its description\n> was added to remote.txt in between the two paragraphs describing\n> 'remote..serverOption'. Reunite these two paragraphs.\n\nOuch. Thanks for spotting and fixing.\n\n>\n> Signed-off-by: Philippe Blain \n> ---\n> Documentation/config/remote.txt | 10 +++++-----\n> 1 file changed, 5 insertions(+), 5 deletions(-)\n>\n> diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt\n> index 4118c219c13..1b9814e8aa4 100644\n> --- a/Documentation/config/remote.txt\n> +++ b/Documentation/config/remote.txt\n> @@ -101,6 +101,11 @@ remote..serverOption::\n> \tThe default set of server options used when fetching from this remote.\n> \tThese server options can be overridden by the `--server-option=` command\n> \tline arguments.\n> ++\n> +This is a multi-valued variable, and an empty value can be used in a higher\n> +priority configuration file (e.g. `.git/config` in a repository) to clear\n> +the values inherited from a lower priority configuration files (e.g.\n> +`$HOME/.gitconfig`).\n> \n> remote..followRemoteHEAD::\n> \tHow linkgit:git-fetch[1] should handle updates to `remotes//HEAD`.\n> @@ -114,8 +119,3 @@ remote..followRemoteHEAD::\n> \tSetting to \"always\" will silently update it to the value on the remote.\n> \tFinally, setting it to \"never\" will never change or create the local\n> \treference.\n> -+\n> -This is a multi-valued variable, and an empty value can be used in a higher\n> -priority configuration file (e.g. `.git/config` in a repository) to clear\n> -the values inherited from a lower priority configuration files (e.g.\n> -`$HOME/.gitconfig`).\n"},{"id":"512444","messageId":"D7SID7X5ZGKY.BZY6LVZ57YUR@ferdinandy.com","threadId":"62954","inReplyTo":"140794b8846e94ec3ff77920f0153f65d434f07e.1739554578.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 2/2] config/remote.txt: improve wording for 'remote..followRemoteHEAD'","fromName":"Bence Ferdinandy","fromEmail":"bence@ferdinandy.com","sentAt":"2025-02-14T22:05:53Z","receivedAt":"2025-02-14T22:11:32Z","isPatch":true,"sender":{"key":"bence@ferdinandy.com","avatar":"https://avatars.githubusercontent.com/u/6343487?v=4"},"body":"\nOn Fri Feb 14, 2025 at 18:36, Philippe Blain via GitGitGadget wrote:\n> From: Philippe Blain \n>\n> Signed-off-by: Philippe Blain \n> ---\n> Documentation/config/remote.txt | 12 ++++++------\n> 1 file changed, 6 insertions(+), 6 deletions(-)\n>\n> diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt\n> index 1b9814e8aa4..25fe219d103 100644\n> --- a/Documentation/config/remote.txt\n> +++ b/Documentation/config/remote.txt\n> @@ -110,12 +110,12 @@ the values inherited from a lower priority configuration files (e.g.\n> remote..followRemoteHEAD::\n> \tHow linkgit:git-fetch[1] should handle updates to `remotes//HEAD`.\n> \tThe default value is \"create\", which will create `remotes//HEAD`\n> -\tif it exists on the remote, but not locally, but will not touch an\n> -\talready existing local reference. Setting to \"warn\" will print\n> -\ta message if the remote has a different value, than the local one and\n> +\tif it exists on the remote, but not locally; this will not touch an\n> +\talready existing local reference. Setting it to \"warn\" will print\n> +\ta message if the remote has a different value than the local one;\n> \tin case there is no local reference, it behaves like \"create\".\n> \tA variant on \"warn\" is \"warn-if-not-$branch\", which behaves like\n> \t\"warn\", but if `HEAD` on the remote is `$branch` it will be silent.\n> -\tSetting to \"always\" will silently update it to the value on the remote.\n> -\tFinally, setting it to \"never\" will never change or create the local\n> -\treference.\n> +\tSetting it to \"always\" will silently update `remotes//HEAD` to\n> +\tthe value on the remote. Finally, setting it to \"never\" will never\n> +\tchange or create the local reference.\n\nI'm personally not a huge fan of semicolons, but I do agree that the text does\nnot flow particularly well. Wouldn't it actually make sense to format this as\na list, with an entry for each option? The would probably also help in quickly\nparsing how many options there are.\n\n"},{"id":"512940","messageId":"f7ec8e1b-7f77-c989-e07d-73e6c5d05e2f@gmail.com","threadId":"62954","inReplyTo":"D7SID7X5ZGKY.BZY6LVZ57YUR@ferdinandy.com","subject":"Re: [PATCH 2/2] config/remote.txt: improve wording for 'remote..followRemoteHEAD'","fromName":"Philippe Blain","fromEmail":"levraiphilippeblain@gmail.com","sentAt":"2025-02-25T02:58:01Z","receivedAt":"2025-02-25T02:55:18Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"Hi Bence,\n\nLe 2025-02-14 à 17:05, Bence Ferdinandy a écrit :\n> \n> On Fri Feb 14, 2025 at 18:36, Philippe Blain via GitGitGadget wrote:\n>> From: Philippe Blain \n>>\n>> Signed-off-by: Philippe Blain \n>> ---\n>> Documentation/config/remote.txt | 12 ++++++------\n>> 1 file changed, 6 insertions(+), 6 deletions(-)\n>>\n>> diff --git a/Documentation/config/remote.txt b/Documentation/config/remote.txt\n>> index 1b9814e8aa4..25fe219d103 100644\n>> --- a/Documentation/config/remote.txt\n>> +++ b/Documentation/config/remote.txt\n>> @@ -110,12 +110,12 @@ the values inherited from a lower priority configuration files (e.g.\n>> remote..followRemoteHEAD::\n>> \tHow linkgit:git-fetch[1] should handle updates to `remotes//HEAD`.\n>> \tThe default value is \"create\", which will create `remotes//HEAD`\n>> -\tif it exists on the remote, but not locally, but will not touch an\n>> -\talready existing local reference. Setting to \"warn\" will print\n>> -\ta message if the remote has a different value, than the local one and\n>> +\tif it exists on the remote, but not locally; this will not touch an\n>> +\talready existing local reference. Setting it to \"warn\" will print\n>> +\ta message if the remote has a different value than the local one;\n>> \tin case there is no local reference, it behaves like \"create\".\n>> \tA variant on \"warn\" is \"warn-if-not-$branch\", which behaves like\n>> \t\"warn\", but if `HEAD` on the remote is `$branch` it will be silent.\n>> -\tSetting to \"always\" will silently update it to the value on the remote.\n>> -\tFinally, setting it to \"never\" will never change or create the local\n>> -\treference.\n>> +\tSetting it to \"always\" will silently update `remotes//HEAD` to\n>> +\tthe value on the remote. Finally, setting it to \"never\" will never\n>> +\tchange or create the local reference.\n> \n> I'm personally not a huge fan of semicolons, but I do agree that the text does\n> not flow particularly well. Wouldn't it actually make sense to format this as\n> a list, with an entry for each option? The would probably also help in quickly\n> parsing how many options there are.\n\nI think lists are a good idea in general, but since there is no uniformity with regards\nto that in the rest of the documentation, I would keep it as-is for this series.\n\nThanks,\n\nPhilippe.\n"}]}