# [PATCH] Fix formatting in git-config(1) 9 messages from 2012-06-20 to 2012-06-23. Participants: Andreas Schwab, Junio C Hamano. Thread: https://gitlist.dev/t/30855 ## Andreas Schwab, 2012-06-20 22:49 Subject: [PATCH] Fix formatting in git-config(1) Message-ID: URL: https://gitlist.dev/e/m2vcil4n0w.fsf%40igel.home ``` Remove the open block markers from the status.showUntrackedFiles entry as they cause all remaining entries to be indented one level too much. Signed-off-by: Andreas Schwab --- I haven't been able to make the paragraph after the nested list of the entry indented the same as the first one. That appears to be a bug in asciidoc, unless I'm misunderstanding something. What should have worked, AFAICS, would be placing the last paragraph inside the open block and remove the preceding continuation marker, but doesn't change anything from the status quo. Andreas. Documentation/config.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 915cb5a..182ca3d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1946,11 +1946,9 @@ status.showUntrackedFiles:: systems. So, this variable controls how the commands displays the untracked files. Possible values are: + --- * `no` - Show no untracked files. * `normal` - Show untracked files and directories. * `all` - Show also individual files in untracked directories. --- + If this variable is not specified, it defaults to 'normal'. This variable can be overridden with the -u|--untracked-files option -- 1.7.11 -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Junio C Hamano, 2012-06-20 22:56 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: <7v4nq5twwg.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4nq5twwg.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Andreas Schwab writes: > Remove the open block markers from the status.showUntrackedFiles entry > as they cause all remaining entries to be indented one level too much. Hrm... I looked at http://git-htmldocs.googlecode.com/git/git-config.html and am unsure what "one level too much" you are referring to. Also looking at the output from $ git config --help I see (RHS end truncated to avoid line wrapping in MUA): status.showUntrackedFiles By default, git-status(1) and git-commit(1) show files whi tracked by Git. Directories which contain only untracked f the directory name only. Showing untracked files means tha lstat() all all the files in the whole repository, which m systems. So, this variable controls how the commands displ files. Possible values are: · no - Show no untracked files. · normal - Show untracked files and directories. · all - Show also individual files in untracked directo If this variable is not specified, it defaults to normal. overridden with the -u|--untracked-files option of git-sta commit(1). ``` ## Andreas Schwab, 2012-06-20 23:05 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: URL: https://gitlist.dev/e/m2r4t94maf.fsf%40igel.home In-Reply-To: <7v4nq5twwg.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > Andreas Schwab writes: > >> Remove the open block markers from the status.showUntrackedFiles entry >> as they cause all remaining entries to be indented one level too much. > > Hrm... > > I looked at http://git-htmldocs.googlecode.com/git/git-config.html > and am unsure what "one level too much" you are referring to. I'm using asciidoc 8.4.5. Probably version dependent. > Also looking at the output from > > $ git config --help > > I see (RHS end truncated to avoid line wrapping in MUA): This is what I see: status.showUntrackedFiles By default, git-status(1) and git-commit(1) show files which are not currently tracked by Git. Directories which contain only untracked files, are shown with the directory name only. Showing untracked files means that Git needs to lstat() all all the files in the whole repository, which might be slow on some systems. So, this variable controls how the commands displays the untracked files. Possible values are: · no - Show no untracked files. · normal - Show untracked files and directories. · all - Show also individual files in untracked directories. If this variable is not specified, it defaults to normal. This variable can be overridden with the -u|--untracked-files option of git-status(1) and git-commit(1). status.submodulesummary Defaults to false. If this is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit option of git- submodule(1)). Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Junio C Hamano, 2012-06-22 23:52 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: <7v62ainbub.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v62ainbub.fsf%40alter.siamese.dyndns.org In-Reply-To: <7v4nq5twwg.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > Andreas Schwab writes: > >> Remove the open block markers from the status.showUntrackedFiles entry >> as they cause all remaining entries to be indented one level too much. > > Hrm... > > I looked at http://git-htmldocs.googlecode.com/git/git-config.html > and am unsure what "one level too much" you are referring to. Also > looking at the output from > > $ git config --help > > I see (RHS end truncated to avoid line wrapping in MUA): > > status.showUntrackedFiles > By default, git-status(1) and git-commit(1) show files whi > tracked by Git. Directories which contain only untracked f > the directory name only. Showing untracked files means tha > lstat() all all the files in the whole repository, which m > systems. So, this variable controls how the commands displ > files. Possible values are: > > · no - Show no untracked files. > > · normal - Show untracked files and directories. > > · all - Show also individual files in untracked directo > > If this variable is not specified, it defaults to normal. > overridden with the -u|--untracked-files option of git-sta > commit(1). Worse yet, with AsciiDoc 8.5.2, here is what I see with your patch (again, RHS end truncated to avoid line wrapping in MUA): status.showUntrackedFiles By default, git-status(1) and git-commit(1) show files w Directories which contain only untracked files, are show Showing untracked files means that Git needs to lstat() repository, which might be slow on some systems. So, thi displays the untracked files. Possible values are: * no - Show no untracked files. * normal - Show untracked files and directories. * all - Show also individual files in untracked direc If this variable is not specified, it defaults to n with the -u|--untracked-files option of git-status( So... ``` ## Andreas Schwab, 2012-06-23 08:01 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: URL: https://gitlist.dev/e/m2y5neqwwj.fsf%40linux-m68k.org In-Reply-To: <7v62ainbub.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > Junio C Hamano writes: > >> Andreas Schwab writes: >> >>> Remove the open block markers from the status.showUntrackedFiles entry >>> as they cause all remaining entries to be indented one level too much. >> >> Hrm... >> >> I looked at http://git-htmldocs.googlecode.com/git/git-config.html >> and am unsure what "one level too much" you are referring to. Also >> looking at the output from >> >> $ git config --help >> >> I see (RHS end truncated to avoid line wrapping in MUA): >> >> status.showUntrackedFiles >> By default, git-status(1) and git-commit(1) show files whi >> tracked by Git. Directories which contain only untracked f >> the directory name only. Showing untracked files means tha >> lstat() all all the files in the whole repository, which m >> systems. So, this variable controls how the commands displ >> files. Possible values are: >> >> · no - Show no untracked files. >> >> · normal - Show untracked files and directories. >> >> · all - Show also individual files in untracked directo >> >> If this variable is not specified, it defaults to normal. >> overridden with the -u|--untracked-files option of git-sta >> commit(1). > > Worse yet, with AsciiDoc 8.5.2, here is what I see with your patch > (again, RHS end truncated to avoid line wrapping in MUA): > > status.showUntrackedFiles > > By default, git-status(1) and git-commit(1) show files w > Directories which contain only untracked files, are show > Showing untracked files means that Git needs to lstat() > repository, which might be slow on some systems. So, thi > displays the untracked files. Possible values are: > > * no - Show no untracked files. > > * normal - Show untracked files and directories. > > * all - Show also individual files in untracked direc > > If this variable is not specified, it defaults to n > with the -u|--untracked-files option of git-status( > > So... I get this layout no matter what, with and without the block markers, both with version 8.4.5 and 8.6.6. But with the block markers the remaining entries are indented too much. So... Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Junio C Hamano, 2012-06-23 08:12 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: <7vbokala5e.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbokala5e.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Andreas Schwab writes: > Junio C Hamano writes: > >> Junio C Hamano writes: >> >>> Andreas Schwab writes: >>> >>>> Remove the open block markers from the status.showUntrackedFiles entry >>>> as they cause all remaining entries to be indented one level too much. >>> >>> Hrm... >>> >>> I looked at http://git-htmldocs.googlecode.com/git/git-config.html >>> and am unsure what "one level too much" you are referring to. Also >>> looking at the output from >>> >>> $ git config --help >>> >>> I see (RHS end truncated to avoid line wrapping in MUA): >>> >>> status.showUntrackedFiles >>> By default, git-status(1) and git-commit(1) show files whi >>> tracked by Git. Directories which contain only untracked f >>> the directory name only. Showing untracked files means tha >>> lstat() all all the files in the whole repository, which m >>> systems. So, this variable controls how the commands displ >>> files. Possible values are: >>> >>> · no - Show no untracked files. >>> >>> · normal - Show untracked files and directories. >>> >>> · all - Show also individual files in untracked directo >>> >>> If this variable is not specified, it defaults to normal. >>> overridden with the -u|--untracked-files option of git-sta >>> commit(1). >> >> Worse yet, with AsciiDoc 8.5.2, here is what I see with your patch >> (again, RHS end truncated to avoid line wrapping in MUA): >> >> status.showUntrackedFiles >> >> By default, git-status(1) and git-commit(1) show files w >> Directories which contain only untracked files, are show >> Showing untracked files means that Git needs to lstat() >> repository, which might be slow on some systems. So, thi >> displays the untracked files. Possible values are: >> >> * no - Show no untracked files. >> >> * normal - Show untracked files and directories. >> >> * all - Show also individual files in untracked direc >> >> If this variable is not specified, it defaults to n >> with the -u|--untracked-files option of git-status( >> >> So... > > I get this layout no matter what, with and without the block markers, > both with version 8.4.5 and 8.6.6. But with the block markers the > remaining entries are indented too much. > > So... So with your patch, users of AsciiDoc 8.5.2 will be harmed by the same breakage as you get with 8.4.5 and 8.6.6 with or without your patch, and without your patch, users of AsciiDoc 8.5.2 gets a lot more reasonable output than with your patch? Can't we have a patch that makes everybody happier than what each is currently seeing---that would be a progress without regression to anybody. ``` ## Andreas Schwab, 2012-06-23 08:51 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: URL: https://gitlist.dev/e/m2r4t6qulo.fsf%40linux-m68k.org In-Reply-To: <7vbokala5e.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > So with your patch, users of AsciiDoc 8.5.2 will be harmed by the > same breakage as you get with 8.4.5 and 8.6.6 with or without your > patch, and without your patch, users of AsciiDoc 8.5.2 gets a lot > more reasonable output than with your patch? The behaviour is completely independent from the asciidoc version. All three versions produce the same output. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Andreas Schwab, 2012-06-23 12:29 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: URL: https://gitlist.dev/e/m2boka5i0a.fsf%40igel.home In-Reply-To: <7vbokala5e.fsf@alter.siamese.dyndns.org> ``` I've now found out that this is a bug in the docbook-xsl stylesheets, updating to 1.77.1 fixed the formatting. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Junio C Hamano, 2012-06-23 18:27 Subject: Re: [PATCH] Fix formatting in git-config(1) Message-ID: <7vy5ndkhnz.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vy5ndkhnz.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Andreas Schwab writes: > I've now found out that this is a bug in the docbook-xsl stylesheets, > updating to 1.77.1 fixed the formatting. Thanks for digging! ```