{"thread":{"id":"49639","subject":"[PATCH 0/6] various fixes for docs","startedAt":"2018-10-22T20:46:10Z","lastAt":"2018-10-22T21:14:51Z","messageCount":8,"participants":["Andreas Heiduk","Eric Sunshine"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"361192","messageId":"20181022204546.20354-1-asheiduk@gmail.com","threadId":"49639","inReplyTo":null,"subject":"[PATCH 0/6] various fixes for docs","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2018-10-22T20:45:40Z","receivedAt":"2018-10-22T20:46:10Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"A small batch of fixes for the docs. All but the very first fixes\nformatting and similar stuff. The first one makes parsing \n'git worktree list' more future-proof.\n\nAndreas Heiduk (6):\n doc: clarify boundaries of 'git worktree list --porcelain'\n doc: fix ASCII art tab spacing\n doc: fix inappropriate monospace formatting\n doc: fix descripion for 'git tag --format'\n doc: fix indentation of listing blocks in gitweb.conf.txt\n doc: fix formatting in git-update-ref\n\n Documentation/git-bisect-lk2009.txt | 30 ++++++++++++++---------------\n Documentation/git-checkout.txt | 14 +++++++-------\n Documentation/git-merge-base.txt | 6 +++---\n Documentation/git-tag.txt | 12 ++++++------\n Documentation/git-update-ref.txt | 8 ++++----\n Documentation/git-upload-pack.txt | 1 +\n Documentation/git-worktree.txt | 4 ++--\n Documentation/git.txt | 10 +++++-----\n Documentation/gitattributes.txt | 30 ++++++++++++++---------------\n Documentation/gitmodules.txt | 17 +++++++++-------\n Documentation/gitsubmodules.txt | 14 +++++++++-----\n Documentation/gitweb.conf.txt | 25 ++++++++++++++----------\n 12 files changed, 92 insertions(+), 79 deletions(-)\n\n-- \n2.19.1\n\n"},{"id":"361193","messageId":"20181022204546.20354-2-asheiduk@gmail.com","threadId":"49639","inReplyTo":"20181022204546.20354-1-asheiduk@gmail.com","subject":"[PATCH 1/6] doc: clarify boundaries of 'git worktree list --porcelain'","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2018-10-22T20:45:41Z","receivedAt":"2018-10-22T20:46:24Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"Defined delimiters for 'git worktree list --porcelain' make the format\neasier to parse in scripts. For example\n\n\tsed -n '/^worktree ID$/,/^$/p'\n\nextracts only the information for the worktree 'ID'.\n\nThe format did not changed since [1], only the guaranty is added.\n\n[1] bb9c03b82a (worktree: add 'list' command, 2015-10-08)\n\nSigned-off-by: Andreas Heiduk \n---\n Documentation/git-worktree.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex e2ee9fc21b..73520434f6 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -270,8 +270,8 @@ Porcelain Format\n The porcelain format has a line per attribute. Attributes are listed with a\n label and value separated by a single space. Boolean attributes (like 'bare'\n and 'detached') are listed as a label only, and are only present if and only\n-if the value is true. An empty line indicates the end of a worktree. For\n-example:\n+if the value is true. The first attribute of a worktree is always `worktree`,\n+an empty line indicates the end of the record. For example:\n \n ------------\n $ git worktree list --porcelain\n-- \n2.19.1\n\n"},{"id":"361194","messageId":"20181022204546.20354-3-asheiduk@gmail.com","threadId":"49639","inReplyTo":"20181022204546.20354-1-asheiduk@gmail.com","subject":"[PATCH 2/6] doc: fix ASCII art tab spacing","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2018-10-22T20:45:42Z","receivedAt":"2018-10-22T20:46:26Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"Followup to 5dd05ebf (\"doc: fix merge-base ASCII art tab spacing\", 2016-10-21)\n\nSigned-off-by: Andreas Heiduk \n---\n Documentation/git-bisect-lk2009.txt | 30 ++++++++++++++---------------\n Documentation/git-checkout.txt | 14 +++++++-------\n Documentation/git-merge-base.txt | 6 +++---\n 3 files changed, 25 insertions(+), 25 deletions(-)\n\ndiff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt\nindex 0f9ef2f25e..e99925184d 100644\n--- a/Documentation/git-bisect-lk2009.txt\n+++ b/Documentation/git-bisect-lk2009.txt\n@@ -633,11 +633,11 @@ and so at step 3) we compute f(X).\n Let's take the following graph as an example:\n \n -------------\n-\t G-H-I-J\n-\t / \\\n+ G-H-I-J\n+ / \\\n A-B-C-D-E-F O\n-\t \\ /\n-\t K-L-M-N\n+ \\ /\n+ K-L-M-N\n -------------\n \n If we compute the following non optimal function on it:\n@@ -649,25 +649,25 @@ g(X) = min(number_of_ancestors(X), number_of_descendants(X))\n we get:\n \n -------------\n-\t 4 3 2 1\n-\t G-H-I-J\n+ 4 3 2 1\n+ G-H-I-J\n 1 2 3 4 5 6/ \\0\n A-B-C-D-E-F O\n-\t \\ /\n-\t K-L-M-N\n-\t 4 3 2 1\n+ \\ /\n+ K-L-M-N\n+ 4 3 2 1\n -------------\n \n but with the algorithm used by git bisect we get:\n \n -------------\n-\t 7 7 6 5\n-\t G-H-I-J\n+ 7 7 6 5\n+ G-H-I-J\n 1 2 3 4 5 6/ \\0\n A-B-C-D-E-F O\n-\t \\ /\n-\t K-L-M-N\n-\t 7 7 6 5\n+ \\ /\n+ K-L-M-N\n+ 7 7 6 5\n -------------\n \n So we chose G, H, K or L as the best bisection point, which is better\n@@ -773,7 +773,7 @@ forked of the main branch at a commit named \"D\" like this:\n -------------\n A-B-C-D-E-F-G <--main\n \\\n-\tH-I-J <--dev\n+ H-I-J <--dev\n -------------\n \n The commit \"D\" is called a \"merge base\" for branch \"main\" and \"dev\"\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 9db02928c4..801de2f764 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -311,9 +311,9 @@ branch refers to a specific commit. Let's look at a repo with three\n commits, one of them tagged, and with branch 'master' checked out:\n \n ------------\n-\t HEAD (refers to branch 'master')\n-\t |\n-\t v\n+ HEAD (refers to branch 'master')\n+ |\n+ v\n a---b---c branch 'master' (refers to commit 'c')\n ^\n |\n@@ -329,9 +329,9 @@ to commit 'd':\n ------------\n $ edit; git add; git commit\n \n-\t HEAD (refers to branch 'master')\n-\t\t|\n-\t\tv\n+ HEAD (refers to branch 'master')\n+ |\n+ v\n a---b---c---d branch 'master' (refers to commit 'd')\n ^\n |\n@@ -398,7 +398,7 @@ at what happens when we then checkout master:\n ------------\n $ git checkout master\n \n-\t HEAD (refers to branch 'master')\n+ HEAD (refers to branch 'master')\n e---f |\n / v\n a---b---c---d branch 'master' (refers to commit 'd')\ndiff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt\nindex 502e00ec35..9f07f4f6ed 100644\n--- a/Documentation/git-merge-base.txt\n+++ b/Documentation/git-merge-base.txt\n@@ -154,13 +154,13 @@ topic origin/master`, the history of remote-tracking branch\n `origin/master` may have been rewound and rebuilt, leading to a\n history of this shape:\n \n-\t\t\t o---B2\n+\t o---B2\n \t /\n \t---o---o---B1--o---o---o---B (origin/master)\n \t \\\n-\t\t B0\n+\t B0\n \t \\\n-\t\t D0---D1---D (topic)\n+\t D0---D1---D (topic)\n \n where `origin/master` used to point at commits B0, B1, B2 and now it\n points at B, and your `topic` branch was started on top of it back\n-- \n2.19.1\n\n"},{"id":"361195","messageId":"20181022204546.20354-4-asheiduk@gmail.com","threadId":"49639","inReplyTo":"20181022204546.20354-1-asheiduk@gmail.com","subject":"[PATCH 3/6] doc: fix inappropriate monospace formatting","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2018-10-22T20:45:43Z","receivedAt":"2018-10-22T20:46:27Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"Signed-off-by: Andreas Heiduk \n---\n Documentation/git-upload-pack.txt | 1 +\n Documentation/git.txt | 10 +++++-----\n Documentation/gitattributes.txt | 30 +++++++++++++++---------------\n Documentation/gitmodules.txt | 17 ++++++++++-------\n Documentation/gitsubmodules.txt | 14 +++++++++-----\n 5 files changed, 40 insertions(+), 32 deletions(-)\n\ndiff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt\nindex 822ad593af..998f52d3df 100644\n--- a/Documentation/git-upload-pack.txt\n+++ b/Documentation/git-upload-pack.txt\n@@ -11,6 +11,7 @@ SYNOPSIS\n [verse]\n 'git-upload-pack' [--[no-]strict] [--timeout=] [--stateless-rpc]\n \t\t [--advertise-refs] \n+\n DESCRIPTION\n -----------\n Invoked by 'git fetch-pack', learns what\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 2ac9b1c7fe..00156d64aa 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -402,11 +402,11 @@ Git so take care if using a foreign front-end.\n \tof Git object directories which can be used to search for Git\n \tobjects. New objects will not be written to these directories.\n +\n-\tEntries that begin with `\"` (double-quote) will be interpreted\n-\tas C-style quoted paths, removing leading and trailing\n-\tdouble-quotes and respecting backslash escapes. E.g., the value\n-\t`\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths:\n-\t`path-with-\"-and-:-in-it` and `vanilla-path`.\n+Entries that begin with `\"` (double-quote) will be interpreted\n+as C-style quoted paths, removing leading and trailing\n+double-quotes and respecting backslash escapes. E.g., the value\n+`\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths:\n+`path-with-\"-and-:-in-it` and `vanilla-path`.\n \n `GIT_DIR`::\n \tIf the `GIT_DIR` environment variable is set then it\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 92010b062e..b8392fc330 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -303,21 +303,21 @@ number of pitfalls:\n attribute. If you decide to use the `working-tree-encoding` attribute\n in your repository, then it is strongly recommended to ensure that all\n clients working with the repository support it.\n-\n- For example, Microsoft Visual Studio resources files (`*.rc`) or\n- PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.\n- If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with\n- a `working-tree-encoding` enabled Git client, then `foo.ps1` will be\n- stored as UTF-8 internally. A client without `working-tree-encoding`\n- support will checkout `foo.ps1` as UTF-8 encoded file. This will\n- typically cause trouble for the users of this file.\n-\n- If a Git client, that does not support the `working-tree-encoding`\n- attribute, adds a new file `bar.ps1`, then `bar.ps1` will be\n- stored \"as-is\" internally (in this example probably as UTF-16).\n- A client with `working-tree-encoding` support will interpret the\n- internal contents as UTF-8 and try to convert it to UTF-16 on checkout.\n- That operation will fail and cause an error.\n++\n+For example, Microsoft Visual Studio resources files (`*.rc`) or\n+PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.\n+If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with\n+a `working-tree-encoding` enabled Git client, then `foo.ps1` will be\n+stored as UTF-8 internally. A client without `working-tree-encoding`\n+support will checkout `foo.ps1` as UTF-8 encoded file. This will\n+typically cause trouble for the users of this file.\n++\n+If a Git client, that does not support the `working-tree-encoding`\n+attribute, adds a new file `bar.ps1`, then `bar.ps1` will be\n+stored \"as-is\" internally (in this example probably as UTF-16).\n+A client with `working-tree-encoding` support will interpret the\n+internal contents as UTF-8 and try to convert it to UTF-16 on checkout.\n+That operation will fail and cause an error.\n \n - Reencoding content to non-UTF encodings can cause errors as the\n conversion might not be UTF-8 round trip safe. If you suspect your\ndiff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\nindex 4d63def206..312b6f9259 100644\n--- a/Documentation/gitmodules.txt\n+++ b/Documentation/gitmodules.txt\n@@ -67,7 +67,8 @@ submodule..fetchRecurseSubmodules::\n submodule..ignore::\n \tDefines under what circumstances \"git status\" and the diff family show\n \ta submodule as modified. The following values are supported:\n-\n++\n+--\n \tall;; The submodule will never be considered modified (but will\n \t nonetheless show up in the output of status and commit when it has\n \t been staged).\n@@ -84,12 +85,14 @@ submodule..ignore::\n \t differences, and modifications to tracked and untracked files are\n \t shown. This is the default option.\n \n-\tIf this option is also present in the submodules entry in .git/config\n-\tof the superproject, the setting there will override the one found in\n-\t.gitmodules.\n-\tBoth settings can be overridden on the command line by using the\n-\t\"--ignore-submodule\" option. The 'git submodule' commands are not\n-\taffected by this setting.\n+If this option is also present in the submodules entry in .git/config\n+of the superproject, the setting there will override the one found in\n+.gitmodules.\n+\n+Both settings can be overridden on the command line by using the\n+\"--ignore-submodule\" option. The 'git submodule' commands are not\n+affected by this setting.\n+--\n \n submodule..shallow::\n \tWhen set to true, a clone of this submodule will be performed as a\ndiff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt\nindex 504c5f1a88..57999e9f36 100644\n--- a/Documentation/gitsubmodules.txt\n+++ b/Documentation/gitsubmodules.txt\n@@ -169,11 +169,15 @@ ACTIVE SUBMODULES\n \n A submodule is considered active,\n \n- (a) if `submodule..active` is set to `true`\n- or\n- (b) if the submodule's path matches the pathspec in `submodule.active`\n- or\n- (c) if `submodule..url` is set.\n+ a. if `submodule..active` is set to `true`\n++\n+or\n+\n+ b. if the submodule's path matches the pathspec in `submodule.active`\n++\n+or\n+\n+ c. if `submodule..url` is set.\n \n and these are evaluated in this order.\n \n-- \n2.19.1\n\n"},{"id":"361196","messageId":"20181022204546.20354-6-asheiduk@gmail.com","threadId":"49639","inReplyTo":"20181022204546.20354-1-asheiduk@gmail.com","subject":"[PATCH 5/6] doc: fix indentation of listing blocks in gitweb.conf.txt","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2018-10-22T20:45:45Z","receivedAt":"2018-10-22T20:46:28Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"'gitweb.conf.txt' uses inconsistent indentation in listing blocks and a mix\nof listing blocks and literal paragraphs. Both didn't look pretty in the\nrendered HTML page.\n\nSigned-off-by: Andreas Heiduk \n---\n Documentation/gitweb.conf.txt | 25 +++++++++++++++----------\n 1 file changed, 15 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex 9c8982ec98..c0a326e388 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -19,10 +19,12 @@ end of a line is ignored. See *perlsyn*(1) for details.\n \n An example:\n \n- # gitweb configuration file for http://git.example.org\n- #\n- our $projectroot = \"/srv/git\"; # FHS recommendation\n- our $site_name = 'Example.org >> Repos';\n+------------------------------------------------\n+# gitweb configuration file for http://git.example.org\n+#\n+our $projectroot = \"/srv/git\"; # FHS recommendation\n+our $site_name = 'Example.org >> Repos';\n+------------------------------------------------\n \n \n The configuration file is used to override the default settings that\n@@ -357,6 +359,7 @@ $home_link_str::\n +\n For example, the following setting produces a breadcrumb trail like\n \"home / dev / projects / ...\" where \"projects\" is the home link.\n++\n ----------------------------------------------------------------------------\n our @extra_breadcrumbs = (\n [ 'home' => 'https://www.example.org/' ],\n@@ -901,14 +904,16 @@ To enable blame, pickaxe search, and snapshot support (allowing \"tar.gz\" and\n \"zip\" snapshots), while allowing individual projects to turn them off, put\n the following in your GITWEB_CONFIG file:\n \n-\t$feature{'blame'}{'default'} = [1];\n-\t$feature{'blame'}{'override'} = 1;\n+--------------------------------------------------------------------------------\n+$feature{'blame'}{'default'} = [1];\n+$feature{'blame'}{'override'} = 1;\n \n-\t$feature{'pickaxe'}{'default'} = [1];\n-\t$feature{'pickaxe'}{'override'} = 1;\n+$feature{'pickaxe'}{'default'} = [1];\n+$feature{'pickaxe'}{'override'} = 1;\n \n-\t$feature{'snapshot'}{'default'} = ['zip', 'tgz'];\n-\t$feature{'snapshot'}{'override'} = 1;\n+$feature{'snapshot'}{'default'} = ['zip', 'tgz'];\n+$feature{'snapshot'}{'override'} = 1;\n+--------------------------------------------------------------------------------\n \n If you allow overriding for the snapshot feature, you can specify which\n snapshot formats are globally disabled. You can also add any command-line\n-- \n2.19.1\n\n"},{"id":"361197","messageId":"20181022204546.20354-7-asheiduk@gmail.com","threadId":"49639","inReplyTo":"20181022204546.20354-1-asheiduk@gmail.com","subject":"[PATCH 6/6] doc: fix formatting in git-update-ref","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2018-10-22T20:45:46Z","receivedAt":"2018-10-22T20:46:30Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"Remove the parapgraph numbers from lines explaining the reflog format\nand typeset these lines in monospace.\n\nSigned-off-by: Andreas Heiduk \n---\n Documentation/git-update-ref.txt | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt\nindex fda8516677..9671423117 100644\n--- a/Documentation/git-update-ref.txt\n+++ b/Documentation/git-update-ref.txt\n@@ -129,8 +129,8 @@ a line to the log file \"$GIT_DIR/logs/\" (dereferencing all\n symbolic refs before creating the log name) describing the change\n in ref value. Log lines are formatted as:\n \n- . oldsha1 SP newsha1 SP committer LF\n-+\n+ oldsha1 SP newsha1 SP committer LF\n+\n Where \"oldsha1\" is the 40 character hexadecimal value previously\n stored in , \"newsha1\" is the 40 character hexadecimal value of\n and \"committer\" is the committer's name, email address\n@@ -138,8 +138,8 @@ and date in the standard Git committer ident format.\n \n Optionally with -m:\n \n- . oldsha1 SP newsha1 SP committer TAB message LF\n-+\n+ oldsha1 SP newsha1 SP committer TAB message LF\n+\n Where all fields are as described above and \"message\" is the\n value supplied to the -m option.\n \n-- \n2.19.1\n\n"},{"id":"361198","messageId":"20181022204546.20354-5-asheiduk@gmail.com","threadId":"49639","inReplyTo":"20181022204546.20354-1-asheiduk@gmail.com","subject":"[PATCH 4/6] doc: fix descripion for 'git tag --format'","fromName":"Andreas Heiduk","fromEmail":"asheiduk@gmail.com","sentAt":"2018-10-22T20:45:44Z","receivedAt":"2018-10-22T20:46:31Z","isPatch":true,"sender":{"key":"asheiduk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9371344?v=4"},"body":"The '--format=' is now listed in the 'OPTIONS' section, not only\nthe '' string itself. The description moved up a few paragraphs\nbecause '' is not a standalone paramater but a parameter for the\noption '--format'.\n\nSigned-off-by: Andreas Heiduk \n---\n Documentation/git-tag.txt | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt\nindex 92f9c12b87..f2d644e3af 100644\n--- a/Documentation/git-tag.txt\n+++ b/Documentation/git-tag.txt\n@@ -187,6 +187,12 @@ This option is only applicable when listing tags without annotation lines.\n \t`--create-reflog`, but currently does not negate the setting of\n \t`core.logAllRefUpdates`.\n \n+--format=::\n+\tA string that interpolates `%(fieldname)` from a tag ref being shown\n+\tand the object it points at. The format is the same as\n+\tthat of linkgit:git-for-each-ref[1]. When unspecified,\n+\tdefaults to `%(refname:strip=2)`.\n+\n ::\n \tThe name of the tag to create, delete, or describe.\n \tThe new tag name must pass all checks defined by\n@@ -198,12 +204,6 @@ This option is only applicable when listing tags without annotation lines.\n \tThe object that the new tag will refer to, usually a commit.\n \tDefaults to HEAD.\n \n-::\n-\tA string that interpolates `%(fieldname)` from a tag ref being shown\n-\tand the object it points at. The format is the same as\n-\tthat of linkgit:git-for-each-ref[1]. When unspecified,\n-\tdefaults to `%(refname:strip=2)`.\n-\n CONFIGURATION\n -------------\n By default, 'git tag' in sign-with-default mode (-s) will use your\n-- \n2.19.1\n\n"},{"id":"361202","messageId":"CAPig+cTfrwMiYKcOZdiS-yTMCgYo1sfHLFCnX=hxaVyWNqUr8Q@mail.gmail.com","threadId":"49639","inReplyTo":"20181022204546.20354-2-asheiduk@gmail.com","subject":"Re: [PATCH 1/6] doc: clarify boundaries of 'git worktree list --porcelain'","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2018-10-22T21:14:39Z","receivedAt":"2018-10-22T21:14:51Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Mon, Oct 22, 2018 at 4:46 PM Andreas Heiduk wrote:\n> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\n> @@ -270,8 +270,8 @@ Porcelain Format\n> The porcelain format has a line per attribute. Attributes are listed with a\n> label and value separated by a single space. Boolean attributes (like 'bare'\n> and 'detached') are listed as a label only, and are only present if and only\n> -if the value is true. An empty line indicates the end of a worktree. For\n> -example:\n> +if the value is true. The first attribute of a worktree is always `worktree`,\n> +an empty line indicates the end of the record. For example:\n\nWhen I suggested the --porcelain option for \"git worktree list\" and\nprovided an example of its proposed output, the idea all along was\nthat the \"worktree\" line itself would indicate start-of-stanza. A\nblank line between records is superfluous and unnecessary.\nUnfortunately, by the time the implementation was posted with blank\nline as stanza separator, I was not around to contest it, and it ended\nup in a release, after which point it was too late to change it.\n\nSo, the tl;dr is that this documentation update agrees with the\noriginal intention as I envisioned it (although I wouldn't be sad to\nsee the mention of \"blank line\" dropped altogether, but that's perhaps\na separate battle).\n"}]}