{"thread":{"id":"44331","subject":"[PATCH] submodules: update documentaion for submodule branches","startedAt":"2016-10-19T20:43:06Z","lastAt":"2016-10-19T23:01:40Z","messageCount":5,"participants":["Brandon Williams","Stefan Beller","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"304418","messageId":"20161019204254.97659-1-bmwill@google.com","threadId":"44331","inReplyTo":null,"subject":"[PATCH] submodules: update documentaion for submodule branches","fromName":"Brandon Williams","fromEmail":"bmwill@google.com","sentAt":"2016-10-19T20:42:54Z","receivedAt":"2016-10-19T20:43:06Z","isPatch":true,"sender":{"key":"bwilliams.eng@gmail.com","avatar":null},"body":"Update the documentaion for the the special value `.` to indicate that\nit signifies that the tracking branch in the submodule should be the\nsame as the current branch in the superproject.\n\nSigned-off-by: Brandon Williams <bmwill@google.com>\n---\n Documentation/git-submodule.txt | 4 +++-\n Documentation/gitmodules.txt    | 7 +++++--\n 2 files changed, 8 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex bf3bb37..d841573 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -259,7 +259,9 @@ OPTIONS\n --branch::\n \tBranch of repository to add as submodule.\n \tThe name of the branch is recorded as `submodule.<name>.branch` in\n-\t`.gitmodules` for `update --remote`.\n+\t`.gitmodules` for `update --remote`.  A special value of `.` is used to\n+\tindicate that the name of the branch in the submodule should be the\n+\tsame name as the current branch in the current repository.\n \n -f::\n --force::\ndiff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\nindex 10dcc08..8f7c50f 100644\n--- a/Documentation/gitmodules.txt\n+++ b/Documentation/gitmodules.txt\n@@ -50,8 +50,11 @@ submodule.<name>.update::\n \n submodule.<name>.branch::\n \tA remote branch name for tracking updates in the upstream submodule.\n-\tIf the option is not specified, it defaults to 'master'.  See the\n-\t`--remote` documentation in linkgit:git-submodule[1] for details.\n+\tIf the option is not specified, it defaults to 'master'.  A special\n+\tvalue of `.` is used to indicate that the name of the branch in the\n+\tsubmodule should be the same name as the current branch in the\n+\tcurrent repository.  See the `--remote` documentation in\n+\tlinkgit:git-submodule[1] for details.\n \n submodule.<name>.fetchRecurseSubmodules::\n \tThis option can be used to control recursive fetching of this\n-- \n2.10.1\n\n"},{"id":"304419","messageId":"CAGZ79kZAgT2ac_D-xiYCWY-bJZYNx4r7zqbf2i0d4=vfmamw4A@mail.gmail.com","threadId":"44331","inReplyTo":"20161019204254.97659-1-bmwill@google.com","subject":"Re: [PATCH] submodules: update documentaion for submodule branches","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2016-10-19T20:45:52Z","receivedAt":"2016-10-19T20:46:14Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Wed, Oct 19, 2016 at 1:42 PM, Brandon Williams <bmwill@google.com> wrote:\n> Update the documentaion for the the special value `.` to indicate that\n> it signifies that the tracking branch in the submodule should be the\n> same as the current branch in the superproject.\n\nFor reference of other reviewers:\nSee 4d7bc52b178bffe9e484c4dcd92d5353e2ce716f\nas well as https://gerrit-review.googlesource.com/Documentation/user-submodules.html\n\nThanks,\nStefan\n\n>\n> Signed-off-by: Brandon Williams <bmwill@google.com>\n> ---\n>  Documentation/git-submodule.txt | 4 +++-\n>  Documentation/gitmodules.txt    | 7 +++++--\n>  2 files changed, 8 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\n> index bf3bb37..d841573 100644\n> --- a/Documentation/git-submodule.txt\n> +++ b/Documentation/git-submodule.txt\n> @@ -259,7 +259,9 @@ OPTIONS\n>  --branch::\n>         Branch of repository to add as submodule.\n>         The name of the branch is recorded as `submodule.<name>.branch` in\n> -       `.gitmodules` for `update --remote`.\n> +       `.gitmodules` for `update --remote`.  A special value of `.` is used to\n> +       indicate that the name of the branch in the submodule should be the\n> +       same name as the current branch in the current repository.\n>\n>  -f::\n>  --force::\n> diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\n> index 10dcc08..8f7c50f 100644\n> --- a/Documentation/gitmodules.txt\n> +++ b/Documentation/gitmodules.txt\n> @@ -50,8 +50,11 @@ submodule.<name>.update::\n>\n>  submodule.<name>.branch::\n>         A remote branch name for tracking updates in the upstream submodule.\n> -       If the option is not specified, it defaults to 'master'.  See the\n> -       `--remote` documentation in linkgit:git-submodule[1] for details.\n> +       If the option is not specified, it defaults to 'master'.  A special\n> +       value of `.` is used to indicate that the name of the branch in the\n> +       submodule should be the same name as the current branch in the\n> +       current repository.  See the `--remote` documentation in\n> +       linkgit:git-submodule[1] for details.\n>\n>  submodule.<name>.fetchRecurseSubmodules::\n>         This option can be used to control recursive fetching of this\n> --\n> 2.10.1\n>\n"},{"id":"304428","messageId":"xmqqmvi0j9rv.fsf@gitster.mtv.corp.google.com","threadId":"44331","inReplyTo":"20161019204254.97659-1-bmwill@google.com","subject":"Re: [PATCH] submodules: update documentaion for submodule branches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-10-19T21:42:28Z","receivedAt":"2016-10-19T21:42:37Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brandon Williams <bmwill@google.com> writes:\n\n> Update the documentaion for the the special value `.` to indicate that\n> it signifies that the tracking branch in the submodule should be the\n> same as the current branch in the superproject.\n\nThanks.  Will typofix while extending with info supplied by Stefan\nlike so:\n\n    submodules doc: update documentation for \".\" used for submodule branches\n\n    4d7bc52b17 (\"submodule update: allow '.' for branch value\",\n    2016-08-03) adopted from Gerrit a feature to set \".\" as a special\n    value of \"submodule.<name>.branch\" in .gitmodules file to indicate\n    that it signifies that the tracking branch in the submodule should\n    be the same as the current branch in the superproject.\n\n    Update the documentation to describe this.\n\n"},{"id":"304440","messageId":"xmqqzim0hsdz.fsf@gitster.mtv.corp.google.com","threadId":"44331","inReplyTo":"xmqqmvi0j9rv.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] submodules: update documentaion for submodule branches","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-10-19T22:43:20Z","receivedAt":"2016-10-19T22:43:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Brandon Williams <bmwill@google.com> writes:\n>\n>> Update the documentaion for the the special value `.` to indicate that\n>> it signifies that the tracking branch in the submodule should be the\n>> same as the current branch in the superproject.\n>\n> Thanks.  Will typofix while extending with info supplied by Stefan\n> like so:\n\nUgh.  Should have proof-read before sending it out.\n\n>     4d7bc52b17 (\"submodule update: allow '.' for branch value\",\n>     2016-08-03) adopted from Gerrit a feature to set \".\" as a special\n>     value of \"submodule.<name>.branch\" in .gitmodules file to indicate\n>     that it signifies that the tracking branch in the submodule should\n>     be the same as the current branch in the superproject.\n\n    ... in .gitmodules file to indicate that the tracking branch in\n    the submodule should be ...\n\n\"to indicate that it signifies that\" was overly redundant.\n\n\n"},{"id":"304441","messageId":"20161019230130.GA21768@google.com","threadId":"44331","inReplyTo":"xmqqzim0hsdz.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] submodules: update documentaion for submodule branches","fromName":"Brandon Williams","fromEmail":"bmwill@google.com","sentAt":"2016-10-19T23:01:30Z","receivedAt":"2016-10-19T23:01:40Z","isPatch":true,"sender":{"key":"bwilliams.eng@gmail.com","avatar":null},"body":"On 10/19, Junio C Hamano wrote:\n> Junio C Hamano <gitster@pobox.com> writes:\n> \n> > Brandon Williams <bmwill@google.com> writes:\n> >\n> >> Update the documentaion for the the special value `.` to indicate that\n> >> it signifies that the tracking branch in the submodule should be the\n> >> same as the current branch in the superproject.\n> >\n> > Thanks.  Will typofix while extending with info supplied by Stefan\n> > like so:\n> \n> Ugh.  Should have proof-read before sending it out.\n> \n> >     4d7bc52b17 (\"submodule update: allow '.' for branch value\",\n> >     2016-08-03) adopted from Gerrit a feature to set \".\" as a special\n> >     value of \"submodule.<name>.branch\" in .gitmodules file to indicate\n> >     that it signifies that the tracking branch in the submodule should\n> >     be the same as the current branch in the superproject.\n> \n>     ... in .gitmodules file to indicate that the tracking branch in\n>     the submodule should be ...\n> \n> \"to indicate that it signifies that\" was overly redundant.\n\nSorry that seems to have stemed from my poor commit message.\n\n-- \nBrandon Williams\n"}]}