{"thread":{"id":"36307","subject":"[PATCH] Documentation/submodule: Fix submodule. -> . typos","startedAt":"2014-03-27T21:06:20Z","lastAt":"2014-03-28T17:01:30Z","messageCount":5,"participants":["W. Trevor King","Jens Lehmann"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"237946","messageId":"f86f6b48f1c840d50d00c591a296821e0a18ee0d.1395954229.git.wking@tremily.us","threadId":"36307","inReplyTo":null,"subject":"[PATCH] Documentation/submodule: Fix submodule. -> . typos","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2014-03-27T21:06:20Z","receivedAt":"2014-03-27T21:06:20Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"The transition from submodule..* to submodule..* happened\nin 73b0898d (Teach \"git submodule add\" the --name option, 2012-09-30),\nwhich landed in v1.8.1-rc0 on 2012-12-03. The first\nsubmodule..branch reference landed a short time later in\nb9289227 (submodule add: If --branch is given, record it in\n.gitmodules, 2012-12-19), and I was probably just not aware of\n73b0898d. The second submodule..branch reference landed in\n23d25e48 (submodule: explicit local branch creation in module_clone,\n2014-01-26), and is just a copy paste error. This commit updates both\nreferences to the current submodule..branch.\n\nReported-by: Junio C Hamano \nSigned-off-by: W. Trevor King \n---\nThis patch is against master, because 23d25e48 hasn't landed in maint\nyet. If you want, I can split this into two patches, one against\nmaint fixing the b9289227 typo and another against master fixing the\n23d25e48 typo.\n\n Documentation/git-submodule.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex 46c1eeb..77588b0 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -162,7 +162,7 @@ update::\n +\n For updates that clone missing submodules, checkout-mode updates will\n create submodules with detached HEADs; all other modes will create\n-submodules with a local branch named after `submodule..branch`.\n+submodules with a local branch named after `submodule..branch`.\n +\n For updates that do not clone missing submodules, the submodule's HEAD\n is only touched when the remote reference does not match the\n@@ -247,7 +247,7 @@ OPTIONS\n -b::\n --branch::\n \tBranch of repository to add as submodule.\n-\tThe name of the branch is recorded as `submodule..branch` in\n+\tThe name of the branch is recorded as `submodule..branch` in\n \t`.gitmodules` for `update --remote`.\n \n -f::\n-- \n1.9.1.352.gd393d14.dirty\n"},{"id":"237957","messageId":"5334B0F4.60103@web.de","threadId":"36307","inReplyTo":"f86f6b48f1c840d50d00c591a296821e0a18ee0d.1395954229.git.wking@tremily.us","subject":"Re: [PATCH] Documentation/submodule: Fix submodule. -> . typos","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2014-03-27T23:15:00Z","receivedAt":"2014-03-27T23:15:00Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Am 27.03.2014 22:06, schrieb W. Trevor King:\n> The transition from submodule..* to submodule..* happened\n> in 73b0898d (Teach \"git submodule add\" the --name option, 2012-09-30),\n> which landed in v1.8.1-rc0 on 2012-12-03.\n\nNope, the distinction between path and name is way older (AFAIK it\nis there from day one). That was just the point in time where you\ncould choose a different name without editing .gitmodules. And the\nfact that the name is initialized with the path confused a lot of\npeople.\n\n> The first\n> submodule..branch reference landed a short time later in\n> b9289227 (submodule add: If --branch is given, record it in\n> .gitmodules, 2012-12-19), and I was probably just not aware of\n> 73b0898d. The second submodule..branch reference landed in\n> 23d25e48 (submodule: explicit local branch creation in module_clone,\n> 2014-01-26), and is just a copy paste error. This commit updates both\n> references to the current submodule..branch.\n> \n> Reported-by: Junio C Hamano \n> Signed-off-by: W. Trevor King \n> ---\n> This patch is against master, because 23d25e48 hasn't landed in maint\n> yet. If you want, I can split this into two patches, one against\n> maint fixing the b9289227 typo and another against master fixing the\n> 23d25e48 typo.\n\nThis fixes the only two usages of 'submodule..*' in the\nDocumentation I can see in current master.\n\n> Documentation/git-submodule.txt | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n> \n> diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\n> index 46c1eeb..77588b0 100644\n> --- a/Documentation/git-submodule.txt\n> +++ b/Documentation/git-submodule.txt\n> @@ -162,7 +162,7 @@ update::\n> +\n> For updates that clone missing submodules, checkout-mode updates will\n> create submodules with detached HEADs; all other modes will create\n> -submodules with a local branch named after `submodule..branch`.\n> +submodules with a local branch named after `submodule..branch`.\n> +\n> For updates that do not clone missing submodules, the submodule's HEAD\n> is only touched when the remote reference does not match the\n> @@ -247,7 +247,7 @@ OPTIONS\n> -b::\n> --branch::\n> \tBranch of repository to add as submodule.\n> -\tThe name of the branch is recorded as `submodule..branch` in\n> +\tThe name of the branch is recorded as `submodule..branch` in\n> \t`.gitmodules` for `update --remote`.\n> \n> -f::\n> \n"},{"id":"237971","messageId":"20140328020648.GB25485@odin.tremily.us","threadId":"36307","inReplyTo":"5334B0F4.60103@web.de","subject":"Re: [PATCH] Documentation/submodule: Fix submodule. -> . typos","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2014-03-28T02:06:48Z","receivedAt":"2014-03-28T02:06:48Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"On Fri, Mar 28, 2014 at 12:15:00AM +0100, Jens Lehmann wrote:\n> Am 27.03.2014 22:06, schrieb W. Trevor King:\n> > The transition from submodule..* to submodule..* happened\n> > in 73b0898d (Teach \"git submodule add\" the --name option, 2012-09-30),\n> > which landed in v1.8.1-rc0 on 2012-12-03.\n> \n> Nope, the distinction between path and name is way older (AFAIK it\n> is there from day one). That was just the point in time where you\n> could choose a different name without editing .gitmodules. And the\n> fact that the name is initialized with the path confused a lot of\n> people.\n\nBefore 73b0898d, cmd_add used:\n\n git config -f .gitmodules submodule.\"$sm_path\".path \"$sm_path\"\n\nand similar, so I used submodule..branch in my initial\ndocumentation of this patch (v5 of that series) [1]. By the final v8\n(which rebased onto the then-current master with 73b0898d), the\nsurrounding calls were [2]:\n\n git config -f .gitmodules submodule.\"$sm_name\".path \"$sm_path\"\n\nbut I missed the update to in my rebasing. I suppose I could\nhave used instead of in my initial v5 patch, but I was\none of the folks confused by the old name == path behavior ;).\n\n> > This patch is against master, because 23d25e48 hasn't landed in maint\n> > yet. If you want, I can split this into two patches, one against\n> > maint fixing the b9289227 typo and another against master fixing the\n> > 23d25e48 typo.\n> \n> This fixes the only two usages of 'submodule..*' in the\n> Documentation I can see in current master.\n\nRight. However, this patch won't apply to the maint branch (where\n23d25e48 hasn't landed). I'm just saying that we may want to split\nthis patch in half and push the fix for b9289227 in a maintenance\nrelease. On the other hand, we've survived since 2012 with the\ncurrent docs, so *not* splitting this patch apart works for me too.\n\nCheers,\nTrevor\n\n[1]: http://article.gmane.org/gmane.comp.version-control.git/210763\n[2]: http://article.gmane.org/gmane.comp.version-control.git/211832\n\n-- \nThis email may be signed or encrypted with GnuPG (http://www.gnupg.org).\nFor more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\n"},{"id":"238012","messageId":"5335A976.6050908@web.de","threadId":"36307","inReplyTo":"20140328020648.GB25485@odin.tremily.us","subject":"Re: [PATCH] Documentation/submodule: Fix submodule. -> . typos","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2014-03-28T16:55:18Z","receivedAt":"2014-03-28T16:55:18Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"I just noticed that the two patches Junio added to pu have a reworded\ncommit message I'm perfectly happy with.\n\nThanks all.\n\nAm 28.03.2014 03:06, schrieb W. Trevor King:\n> On Fri, Mar 28, 2014 at 12:15:00AM +0100, Jens Lehmann wrote:\n>> Am 27.03.2014 22:06, schrieb W. Trevor King:\n>>> The transition from submodule..* to submodule..* happened\n>>> in 73b0898d (Teach \"git submodule add\" the --name option, 2012-09-30),\n>>> which landed in v1.8.1-rc0 on 2012-12-03.\n>>\n>> Nope, the distinction between path and name is way older (AFAIK it\n>> is there from day one). That was just the point in time where you\n>> could choose a different name without editing .gitmodules. And the\n>> fact that the name is initialized with the path confused a lot of\n>> people.\n> \n> Before 73b0898d, cmd_add used:\n> \n> git config -f .gitmodules submodule.\"$sm_path\".path \"$sm_path\"\n> \n> and similar, so I used submodule..branch in my initial\n> documentation of this patch (v5 of that series) [1]. By the final v8\n> (which rebased onto the then-current master with 73b0898d), the\n> surrounding calls were [2]:\n> \n> git config -f .gitmodules submodule.\"$sm_name\".path \"$sm_path\"\n> \n> but I missed the update to in my rebasing. I suppose I could\n> have used instead of in my initial v5 patch, but I was\n> one of the folks confused by the old name == path behavior ;).\n> \n>>> This patch is against master, because 23d25e48 hasn't landed in maint\n>>> yet. If you want, I can split this into two patches, one against\n>>> maint fixing the b9289227 typo and another against master fixing the\n>>> 23d25e48 typo.\n>>\n>> This fixes the only two usages of 'submodule..*' in the\n>> Documentation I can see in current master.\n> \n> Right. However, this patch won't apply to the maint branch (where\n> 23d25e48 hasn't landed). I'm just saying that we may want to split\n> this patch in half and push the fix for b9289227 in a maintenance\n> release. On the other hand, we've survived since 2012 with the\n> current docs, so *not* splitting this patch apart works for me too.\n> \n> Cheers,\n> Trevor\n> \n> [1]: http://article.gmane.org/gmane.comp.version-control.git/210763\n> [2]: http://article.gmane.org/gmane.comp.version-control.git/211832\n> \n"},{"id":"238014","messageId":"20140328170130.GI25485@odin.tremily.us","threadId":"36307","inReplyTo":"5335A976.6050908@web.de","subject":"Re: [PATCH] Documentation/submodule: Fix submodule. -> . typos","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2014-03-28T17:01:30Z","receivedAt":"2014-03-28T17:01:30Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"On Fri, Mar 28, 2014 at 05:55:18PM +0100, Jens Lehmann wrote:\n> I just noticed that the two patches Junio added to pu have a\n> reworded commit message I'm perfectly happy with.\n\nThe revised wording works for me too.\n\nCheers,\nTrevor\n\n-- \nThis email may be signed or encrypted with GnuPG (http://www.gnupg.org).\nFor more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\n"}]}