{"thread":{"id":"30855","subject":"[PATCH] Fix formatting in git-config(1)","startedAt":"2012-06-20T22:49:19Z","lastAt":"2012-06-23T18:27:28Z","messageCount":9,"participants":["Andreas Schwab","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"194008","messageId":"m2vcil4n0w.fsf@igel.home","threadId":"30855","inReplyTo":null,"subject":"[PATCH] Fix formatting in git-config(1)","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-06-20T22:49:19Z","receivedAt":"2012-06-20T22:49:19Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Remove the open block markers from the status.showUntrackedFiles entry\nas they cause all remaining entries to be indented one level too much.\n\nSigned-off-by: Andreas Schwab \n---\nI haven't been able to make the paragraph after the nested list of the\nentry indented the same as the first one. That appears to be a bug in\nasciidoc, unless I'm misunderstanding something. What should have\nworked, AFAICS, would be placing the last paragraph inside the open\nblock and remove the preceding continuation marker, but doesn't change\nanything from the status quo.\n\nAndreas.\n\n Documentation/config.txt | 2 --\n 1 file changed, 2 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 915cb5a..182ca3d 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1946,11 +1946,9 @@ status.showUntrackedFiles::\n \tsystems. So, this variable controls how the commands displays\n \tthe untracked files. Possible values are:\n +\n---\n * `no` - Show no untracked files.\n * `normal` - Show untracked files and directories.\n * `all` - Show also individual files in untracked directories.\n---\n +\n If this variable is not specified, it defaults to 'normal'.\n This variable can be overridden with the -u|--untracked-files option\n-- \n1.7.11\n\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"194009","messageId":"7v4nq5twwg.fsf@alter.siamese.dyndns.org","threadId":"30855","inReplyTo":"m2vcil4n0w.fsf@igel.home","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-20T22:56:47Z","receivedAt":"2012-06-20T22:56:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Schwab writes:\n\n> Remove the open block markers from the status.showUntrackedFiles entry\n> as they cause all remaining entries to be indented one level too much.\n\nHrm...\n\nI looked at http://git-htmldocs.googlecode.com/git/git-config.html\nand am unsure what \"one level too much\" you are referring to. Also\nlooking at the output from\n\n$ git config --help\n\nI see (RHS end truncated to avoid line wrapping in MUA):\n\n status.showUntrackedFiles\n By default, git-status(1) and git-commit(1) show files whi\n tracked by Git. Directories which contain only untracked f\n the directory name only. Showing untracked files means tha\n lstat() all all the files in the whole repository, which m\n systems. So, this variable controls how the commands displ\n files. Possible values are:\n\n · no - Show no untracked files.\n\n · normal - Show untracked files and directories.\n\n · all - Show also individual files in untracked directo\n\n If this variable is not specified, it defaults to normal. \n overridden with the -u|--untracked-files option of git-sta\n commit(1).\n"},{"id":"194011","messageId":"m2r4t94maf.fsf@igel.home","threadId":"30855","inReplyTo":"7v4nq5twwg.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-06-20T23:05:12Z","receivedAt":"2012-06-20T23:05:12Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Junio C Hamano writes:\n\n> Andreas Schwab writes:\n>\n>> Remove the open block markers from the status.showUntrackedFiles entry\n>> as they cause all remaining entries to be indented one level too much.\n>\n> Hrm...\n>\n> I looked at http://git-htmldocs.googlecode.com/git/git-config.html\n> and am unsure what \"one level too much\" you are referring to.\n\nI'm using asciidoc 8.4.5. Probably version dependent.\n\n> Also looking at the output from\n>\n> $ git config --help\n>\n> I see (RHS end truncated to avoid line wrapping in MUA):\n\nThis is what I see:\n\n status.showUntrackedFiles\n By default, git-status(1) and git-commit(1) show files which are\n not currently tracked by Git. Directories which contain only\n untracked files, are shown with the directory name only. Showing\n untracked files means that Git needs to lstat() all all the files\n in the whole repository, which might be slow on some systems. So,\n this variable controls how the commands displays the untracked\n files. Possible values are:\n\n · no - Show no untracked files.\n\n · normal - Show untracked files and directories.\n\n · all - Show also individual files in untracked directories.\n If this variable is not specified, it defaults to normal. This\n variable can be overridden with the -u|--untracked-files option\n of git-status(1) and git-commit(1).\n\n status.submodulesummary\n Defaults to false. If this is set to a non zero number or true\n (identical to -1 or an unlimited number), the submodule summary\n will be enabled and a summary of commits for modified\n submodules will be shown (see --summary-limit option of git-\n submodule(1)).\n\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"194120","messageId":"7v62ainbub.fsf@alter.siamese.dyndns.org","threadId":"30855","inReplyTo":"7v4nq5twwg.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-22T23:52:44Z","receivedAt":"2012-06-22T23:52:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Andreas Schwab writes:\n>\n>> Remove the open block markers from the status.showUntrackedFiles entry\n>> as they cause all remaining entries to be indented one level too much.\n>\n> Hrm...\n>\n> I looked at http://git-htmldocs.googlecode.com/git/git-config.html\n> and am unsure what \"one level too much\" you are referring to. Also\n> looking at the output from\n>\n> $ git config --help\n>\n> I see (RHS end truncated to avoid line wrapping in MUA):\n>\n> status.showUntrackedFiles\n> By default, git-status(1) and git-commit(1) show files whi\n> tracked by Git. Directories which contain only untracked f\n> the directory name only. Showing untracked files means tha\n> lstat() all all the files in the whole repository, which m\n> systems. So, this variable controls how the commands displ\n> files. Possible values are:\n>\n> · no - Show no untracked files.\n>\n> · normal - Show untracked files and directories.\n>\n> · all - Show also individual files in untracked directo\n>\n> If this variable is not specified, it defaults to normal. \n> overridden with the -u|--untracked-files option of git-sta\n> commit(1).\n\nWorse yet, with AsciiDoc 8.5.2, here is what I see with your patch\n(again, RHS end truncated to avoid line wrapping in MUA):\n\n status.showUntrackedFiles\n\n By default, git-status(1) and git-commit(1) show files w\n Directories which contain only untracked files, are show\n Showing untracked files means that Git needs to lstat() \n repository, which might be slow on some systems. So, thi\n displays the untracked files. Possible values are:\n\n * no - Show no untracked files.\n\n * normal - Show untracked files and directories.\n\n * all - Show also individual files in untracked direc\n\n If this variable is not specified, it defaults to n\n with the -u|--untracked-files option of git-status(\n\nSo...\n"},{"id":"194127","messageId":"m2y5neqwwj.fsf@linux-m68k.org","threadId":"30855","inReplyTo":"7v62ainbub.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-06-23T08:01:48Z","receivedAt":"2012-06-23T08:01:48Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Junio C Hamano writes:\n\n> Junio C Hamano writes:\n>\n>> Andreas Schwab writes:\n>>\n>>> Remove the open block markers from the status.showUntrackedFiles entry\n>>> as they cause all remaining entries to be indented one level too much.\n>>\n>> Hrm...\n>>\n>> I looked at http://git-htmldocs.googlecode.com/git/git-config.html\n>> and am unsure what \"one level too much\" you are referring to. Also\n>> looking at the output from\n>>\n>> $ git config --help\n>>\n>> I see (RHS end truncated to avoid line wrapping in MUA):\n>>\n>> status.showUntrackedFiles\n>> By default, git-status(1) and git-commit(1) show files whi\n>> tracked by Git. Directories which contain only untracked f\n>> the directory name only. Showing untracked files means tha\n>> lstat() all all the files in the whole repository, which m\n>> systems. So, this variable controls how the commands displ\n>> files. Possible values are:\n>>\n>> · no - Show no untracked files.\n>>\n>> · normal - Show untracked files and directories.\n>>\n>> · all - Show also individual files in untracked directo\n>>\n>> If this variable is not specified, it defaults to normal. \n>> overridden with the -u|--untracked-files option of git-sta\n>> commit(1).\n>\n> Worse yet, with AsciiDoc 8.5.2, here is what I see with your patch\n> (again, RHS end truncated to avoid line wrapping in MUA):\n>\n> status.showUntrackedFiles\n>\n> By default, git-status(1) and git-commit(1) show files w\n> Directories which contain only untracked files, are show\n> Showing untracked files means that Git needs to lstat() \n> repository, which might be slow on some systems. So, thi\n> displays the untracked files. Possible values are:\n>\n> * no - Show no untracked files.\n>\n> * normal - Show untracked files and directories.\n>\n> * all - Show also individual files in untracked direc\n>\n> If this variable is not specified, it defaults to n\n> with the -u|--untracked-files option of git-status(\n>\n> So...\n\nI get this layout no matter what, with and without the block markers,\nboth with version 8.4.5 and 8.6.6. But with the block markers the\nremaining entries are indented too much.\n\nSo...\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"194128","messageId":"7vbokala5e.fsf@alter.siamese.dyndns.org","threadId":"30855","inReplyTo":"m2y5neqwwj.fsf@linux-m68k.org","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-23T08:12:13Z","receivedAt":"2012-06-23T08:12:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Schwab writes:\n\n> Junio C Hamano writes:\n>\n>> Junio C Hamano writes:\n>>\n>>> Andreas Schwab writes:\n>>>\n>>>> Remove the open block markers from the status.showUntrackedFiles entry\n>>>> as they cause all remaining entries to be indented one level too much.\n>>>\n>>> Hrm...\n>>>\n>>> I looked at http://git-htmldocs.googlecode.com/git/git-config.html\n>>> and am unsure what \"one level too much\" you are referring to. Also\n>>> looking at the output from\n>>>\n>>> $ git config --help\n>>>\n>>> I see (RHS end truncated to avoid line wrapping in MUA):\n>>>\n>>> status.showUntrackedFiles\n>>> By default, git-status(1) and git-commit(1) show files whi\n>>> tracked by Git. Directories which contain only untracked f\n>>> the directory name only. Showing untracked files means tha\n>>> lstat() all all the files in the whole repository, which m\n>>> systems. So, this variable controls how the commands displ\n>>> files. Possible values are:\n>>>\n>>> · no - Show no untracked files.\n>>>\n>>> · normal - Show untracked files and directories.\n>>>\n>>> · all - Show also individual files in untracked directo\n>>>\n>>> If this variable is not specified, it defaults to normal. \n>>> overridden with the -u|--untracked-files option of git-sta\n>>> commit(1).\n>>\n>> Worse yet, with AsciiDoc 8.5.2, here is what I see with your patch\n>> (again, RHS end truncated to avoid line wrapping in MUA):\n>>\n>> status.showUntrackedFiles\n>>\n>> By default, git-status(1) and git-commit(1) show files w\n>> Directories which contain only untracked files, are show\n>> Showing untracked files means that Git needs to lstat() \n>> repository, which might be slow on some systems. So, thi\n>> displays the untracked files. Possible values are:\n>>\n>> * no - Show no untracked files.\n>>\n>> * normal - Show untracked files and directories.\n>>\n>> * all - Show also individual files in untracked direc\n>>\n>> If this variable is not specified, it defaults to n\n>> with the -u|--untracked-files option of git-status(\n>>\n>> So...\n>\n> I get this layout no matter what, with and without the block markers,\n> both with version 8.4.5 and 8.6.6. But with the block markers the\n> remaining entries are indented too much.\n>\n> So...\n\nSo with your patch, users of AsciiDoc 8.5.2 will be harmed by the\nsame breakage as you get with 8.4.5 and 8.6.6 with or without your\npatch, and without your patch, users of AsciiDoc 8.5.2 gets a lot\nmore reasonable output than with your patch?\n\nCan't we have a patch that makes everybody happier than what each is\ncurrently seeing---that would be a progress without regression to\nanybody.\n"},{"id":"194129","messageId":"m2r4t6qulo.fsf@linux-m68k.org","threadId":"30855","inReplyTo":"7vbokala5e.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-06-23T08:51:31Z","receivedAt":"2012-06-23T08:51:31Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Junio C Hamano writes:\n\n> So with your patch, users of AsciiDoc 8.5.2 will be harmed by the\n> same breakage as you get with 8.4.5 and 8.6.6 with or without your\n> patch, and without your patch, users of AsciiDoc 8.5.2 gets a lot\n> more reasonable output than with your patch?\n\nThe behaviour is completely independent from the asciidoc version. All\nthree versions produce the same output.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"194130","messageId":"m2boka5i0a.fsf@igel.home","threadId":"30855","inReplyTo":"7vbokala5e.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-06-23T12:29:09Z","receivedAt":"2012-06-23T12:29:09Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"I've now found out that this is a bug in the docbook-xsl stylesheets,\nupdating to 1.77.1 fixed the formatting.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"194135","messageId":"7vy5ndkhnz.fsf@alter.siamese.dyndns.org","threadId":"30855","inReplyTo":"m2boka5i0a.fsf@igel.home","subject":"Re: [PATCH] Fix formatting in git-config(1)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-23T18:27:28Z","receivedAt":"2012-06-23T18:27:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Schwab writes:\n\n> I've now found out that this is a bug in the docbook-xsl stylesheets,\n> updating to 1.77.1 fixed the formatting.\n\nThanks for digging!\n"}]}