{"thread":{"id":"53166","subject":"[PATCH 0/2] git-pull.txt: correct outdated example + link to specific 'git fetch' section","startedAt":"2020-04-05T15:50:24Z","lastAt":"2020-04-16T12:40:11Z","messageCount":6,"participants":["Philippe Blain via GitGitGadget","Jeff King","Philippe Blain"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"394793","messageId":"pull.751.git.git.1586101819.gitgitgadget@gmail.com","threadId":"53166","inReplyTo":null,"subject":"[PATCH 0/2] git-pull.txt: correct outdated example + link to specific 'git fetch' section","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-04-05T15:50:17Z","receivedAt":"2020-04-05T15:50:24Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"I was reading the git pull documentation and discovered an outdated example\ndescription. While reading the git fetch documentation to confirm the\nbehaviour described ingit pull was indeed wrong, I figured it would be\neasier to refer directly to the \"Configured remote-tracking branches\"\nsection in git fetch from the git pull documentation, just as in git fetch.\n\nPhilippe Blain (2):\n pull doc: refer to a specific section in 'fetch' doc\n pull doc: correct outdated description of an example\n\n Documentation/git-pull.txt | 6 +++---\n Documentation/pull-fetch-param.txt | 3 ++-\n 2 files changed, 5 insertions(+), 4 deletions(-)\n\n\nbase-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-751%2Fphil-blain%2Fdoc-pull-update-remote-tracking-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-751/phil-blain/doc-pull-update-remote-tracking-v1\nPull-Request: https://github.com/git/git/pull/751\n-- \ngitgitgadget\n"},{"id":"394794","messageId":"9c94c2770f0eb1cbb9383cffde7c275d7d3f52c9.1586101819.git.gitgitgadget@gmail.com","threadId":"53166","inReplyTo":"pull.751.git.git.1586101819.gitgitgadget@gmail.com","subject":"[PATCH 1/2] pull doc: refer to a specific section in 'fetch' doc","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-04-05T15:50:18Z","receivedAt":"2020-04-05T15:50:24Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nThe documentation for the `` parameter in the `git fetch`\ndocumentation refers to the section \"CONFIGURED REMOTE-TRACKING\nBRANCHES\" in this same documentation page.\n\nIn the `git pull` documentation, let's also refer specifically to this\nsection instead of just linking to the `git fetch` documentation.\n\nSigned-off-by: Philippe Blain \n---\n Documentation/pull-fetch-param.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\nindex 7d3a60f5b93..95ea8499029 100644\n--- a/Documentation/pull-fetch-param.txt\n+++ b/Documentation/pull-fetch-param.txt\n@@ -19,7 +19,8 @@ ifndef::git-pull[]\n \t(see <> below).\n endif::git-pull[]\n ifdef::git-pull[]\n-\t(see linkgit:git-fetch[1]).\n+\t(see the section \"CONFIGURED REMOTE-TRACKING BRANCHES\"\n+\tin linkgit:git-fetch[1]).\n endif::git-pull[]\n +\n The format of a parameter is an optional plus\n-- \ngitgitgadget\n\n"},{"id":"394795","messageId":"46365925d22d31feae7618614dd7872a19bebeef.1586101819.git.gitgitgadget@gmail.com","threadId":"53166","inReplyTo":"pull.751.git.git.1586101819.gitgitgadget@gmail.com","subject":"[PATCH 2/2] pull doc: correct outdated description of an example","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-04-05T15:50:19Z","receivedAt":"2020-04-05T15:50:26Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain \n\nSince f269048754 (fetch: opportunistically update tracking refs,\n2013-05-11), the underlying `git fetch` in `git pull `\nupdates the configured remote-tracking branch for .\n\nHowever, an example in the 'Examples' section of the `git pull`\ndocumentation still states that this is not the case.\n\nCorrect the description of this example.\n\nSigned-off-by: Philippe Blain \n---\n Documentation/git-pull.txt | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex dfb901f8b83..21e10905fa2 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -229,9 +229,9 @@ branch..merge options; see linkgit:git-config[1] for details.\n $ git pull origin next\n ------------------------------------------------\n +\n-This leaves a copy of `next` temporarily in FETCH_HEAD, but\n-does not update any remote-tracking branches. Using remote-tracking\n-branches, the same can be done by invoking fetch and merge:\n+This leaves a copy of `next` temporarily in FETCH_HEAD, and\n+updates the remote-tracking branch `origin/next`.\n+The same can be done by invoking fetch and merge:\n +\n ------------------------------------------------\n $ git fetch origin\n-- \ngitgitgadget\n"},{"id":"394882","messageId":"20200406201945.GA1245278@coredump.intra.peff.net","threadId":"53166","inReplyTo":"9c94c2770f0eb1cbb9383cffde7c275d7d3f52c9.1586101819.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/2] pull doc: refer to a specific section in 'fetch' doc","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-04-06T20:19:45Z","receivedAt":"2020-04-06T20:19:47Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Apr 05, 2020 at 03:50:18PM +0000, Philippe Blain via GitGitGadget wrote:\n\n> From: Philippe Blain \n> \n> The documentation for the `` parameter in the `git fetch`\n> documentation refers to the section \"CONFIGURED REMOTE-TRACKING\n> BRANCHES\" in this same documentation page.\n> \n> In the `git pull` documentation, let's also refer specifically to this\n> section instead of just linking to the `git fetch` documentation.\n\nMakes sense. One thought:\n\n> diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\n> index 7d3a60f5b93..95ea8499029 100644\n> --- a/Documentation/pull-fetch-param.txt\n> +++ b/Documentation/pull-fetch-param.txt\n> @@ -19,7 +19,8 @@ ifndef::git-pull[]\n> \t(see <> below).\n> endif::git-pull[]\n> ifdef::git-pull[]\n> -\t(see linkgit:git-fetch[1]).\n> +\t(see the section \"CONFIGURED REMOTE-TRACKING BRANCHES\"\n> +\tin linkgit:git-fetch[1]).\n> endif::git-pull[]\n\nWe can hyperlink directly to this section with the CRTB tag (as you can\nsee in the context above). But I guess we don't have a portable macro to\ndo so across different manpages. Assuming we'd need something like\nlinkgit to accomplish, it's best not to hold up this change waiting for\nthat.\n\n-Peff\n"},{"id":"394883","messageId":"20200406202236.GB1245278@coredump.intra.peff.net","threadId":"53166","inReplyTo":"46365925d22d31feae7618614dd7872a19bebeef.1586101819.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 2/2] pull doc: correct outdated description of an example","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-04-06T20:22:36Z","receivedAt":"2020-04-06T20:22:39Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Apr 05, 2020 at 03:50:19PM +0000, Philippe Blain via GitGitGadget wrote:\n\n> From: Philippe Blain \n> \n> Since f269048754 (fetch: opportunistically update tracking refs,\n> 2013-05-11), the underlying `git fetch` in `git pull `\n> updates the configured remote-tracking branch for .\n> \n> However, an example in the 'Examples' section of the `git pull`\n> documentation still states that this is not the case.\n> \n> Correct the description of this example.\n\nYeah, I think the example just never got updated. Your patch looks good.\n\nAnother option would be to use a direct URL rather than a configured\nremote, which really would just update FETCH_HEAD. But I don't think the\nhandling of remote-tracking branches is central to this example either\nway, so your minimal change is better.\n\n-Peff\n"},{"id":"395583","messageId":"0099CBAF-983E-46F2-B7E9-D5E661189587@gmail.com","threadId":"53166","inReplyTo":"20200406201945.GA1245278@coredump.intra.peff.net","subject":"Re: [PATCH 1/2] pull doc: refer to a specific section in 'fetch' doc","fromName":"Philippe Blain","fromEmail":"levraiphilippeblain@gmail.com","sentAt":"2020-04-16T12:39:36Z","receivedAt":"2020-04-16T12:40:11Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"Hi Peff,\n\n> Le 6 avr. 2020 à 16:19, Jeff King a écrit :\n> \n> One thought:\n> \n>> diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt\n>> index 7d3a60f5b93..95ea8499029 100644\n>> --- a/Documentation/pull-fetch-param.txt\n>> +++ b/Documentation/pull-fetch-param.txt\n>> @@ -19,7 +19,8 @@ ifndef::git-pull[]\n>> \t(see <> below).\n>> endif::git-pull[]\n>> ifdef::git-pull[]\n>> -\t(see linkgit:git-fetch[1]).\n>> +\t(see the section \"CONFIGURED REMOTE-TRACKING BRANCHES\"\n>> +\tin linkgit:git-fetch[1]).\n>> endif::git-pull[]\n> \n> We can hyperlink directly to this section with the CRTB tag (as you can\n> see in the context above). But I guess we don't have a portable macro to\n> do so across different manpages. Assuming we'd need something like\n> linkgit to accomplish, it's best not to hold up this change waiting for\n> that.\n\nI didn't know it was possible. I agree that cross-linking directly to a specific section would be\ngreat, especially if it would work for the manpages, the HTML documentation as well as the website!\n\nPhilippe.\n\n"}]}