{"thread":{"id":"52837","subject":"[PATCH] doc/config/push: use longer \"--\" line for preformatted example","startedAt":"2020-02-18T21:25:39Z","lastAt":"2020-02-18T21:47:38Z","messageCount":2,"participants":["Jeff King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"392023","messageId":"20200218212537.GA33327@coredump.intra.peff.net","threadId":"52837","inReplyTo":null,"subject":"[PATCH] doc/config/push: use longer \"--\" line for preformatted example","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2020-02-18T21:25:37Z","receivedAt":"2020-02-18T21:25:39Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"The example for the push.pushOption config tries to create a\npreformatted section, but uses only two dashes in its \"--\" line. In\nAsciiDoc this is an \"open block\", with no type; the lines end up jumbled\nbecause they're formatted as paragraphs. We need four or more dashes to\nmake it a \"listing block\" that will respect the linebreaks.\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\nI noticed this as part our other discussion. The rendered output of\n\"./doc-diff HEAD^ HEAD\" is:\n\n  @@ -4143,15 +4143,20 @@ CONFIGURATION FILE\n              repository) to clear the values inherited from a lower priority\n              configuration files (e.g.  $HOME/.gitconfig).\n   \n  -           Example:\n  +               Example:\n   \n  -           /etc/gitconfig push.pushoption = a push.pushoption = b\n  +               /etc/gitconfig\n  +                 push.pushoption = a\n  +                 push.pushoption = b\n   \n  -           ~/.gitconfig push.pushoption = c\n  +               ~/.gitconfig\n  +                 push.pushoption = c\n   \n  -           repo/.git/config push.pushoption = push.pushoption = b\n  +               repo/.git/config\n  +                 push.pushoption =\n  +                 push.pushoption = b\n   \n  -           This will result in only b (a and c are cleared).\n  +               This will result in only b (a and c are cleared).\n   \n          push.recurseSubmodules\n              Make sure all submodule commits used by the revisions to be pushed\n\n Documentation/config/push.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config/push.txt b/Documentation/config/push.txt\nindex 54871f8213..0a7aa322a9 100644\n--- a/Documentation/config/push.txt\n+++ b/Documentation/config/push.txt\n@@ -80,7 +80,7 @@ higher priority configuration file (e.g. `.git/config` in a\n repository) to clear the values inherited from a lower priority\n configuration files (e.g. `$HOME/.gitconfig`).\n +\n---\n+----\n \n Example:\n \n@@ -97,7 +97,7 @@ repo/.git/config\n \n This will result in only b (a and c are cleared).\n \n---\n+----\n \n push.recurseSubmodules::\n \tMake sure all submodule commits used by the revisions to be pushed\n-- \n2.25.1.795.g3fd338b409\n"},{"id":"392027","messageId":"xmqqblpvin4a.fsf@gitster-ct.c.googlers.com","threadId":"52837","inReplyTo":"20200218212537.GA33327@coredump.intra.peff.net","subject":"Re: [PATCH] doc/config/push: use longer \"--\" line for preformatted example","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-02-18T21:47:33Z","receivedAt":"2020-02-18T21:47:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> The example for the push.pushOption config tries to create a\n> preformatted section, but uses only two dashes in its \"--\" line. In\n> AsciiDoc this is an \"open block\", with no type; the lines end up jumbled\n> because they're formatted as paragraphs. We need four or more dashes to\n> make it a \"listing block\" that will respect the linebreaks.\n\nAnd the itemized list in push.default is delimited with two dashes\nas a non listing block, so it is shown correctly as a bulletted list\njust fine.  Makes sense.\n\nWill queue.\n\n"}]}