{"thread":{"id":"50664","subject":"[PATCH 0/5] fixing a few Asciidoc/tor differences","startedAt":"2019-03-06T06:30:37Z","lastAt":"2019-03-07T00:29:52Z","messageCount":7,"participants":["Martin Ågren","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"370786","messageId":"cover.1551853194.git.martin.agren@gmail.com","threadId":"50664","inReplyTo":null,"subject":"[PATCH 0/5] fixing a few Asciidoc/tor differences","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-03-06T06:30:13Z","receivedAt":"2019-03-06T06:30:37Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"I've got a W-I-P series to teach our doc-diff tool to diff between\nAsciiDoc and Asciidoctor. It looks promising, and here are a few fixes\nthat fell out from my first round of testing things.\n\nThe W-I-P doc-diff is able to find three types of problems, as shown by\nthese patches. One is where Asciidoctor trips on something, but Asciidoc\ndoesn't. There's the other way around. And sometimes they both stumble,\nbut differently.\n\nBased on maint.\n\nMartin Ågren (5):\n config/diff.txt: drop spurious backtick\n config/fsck.txt: avoid starting line with dash\n git.txt: remove empty line before list continuation\n git-svn.txt: drop escaping '\\' that ends up being rendered\n Documentation: turn middle-of-line tabs into spaces\n\n Documentation/config/diff.txt | 4 ++--\n Documentation/config/fsck.txt | 6 +++---\n Documentation/config/gc.txt | 2 +-\n Documentation/config/gpg.txt | 2 +-\n Documentation/git-config.txt | 2 +-\n Documentation/git-grep.txt | 2 +-\n Documentation/git-http-backend.txt | 2 +-\n Documentation/git-ls-remote.txt | 2 +-\n Documentation/git-notes.txt | 2 +-\n Documentation/git-svn.txt | 10 +++++-----\n Documentation/git.txt | 1 -\n Documentation/gitattributes.txt | 2 +-\n Documentation/gitremote-helpers.txt | 2 +-\n Documentation/gitweb.conf.txt | 2 +-\n Documentation/rev-list-options.txt | 2 +-\n 15 files changed, 21 insertions(+), 22 deletions(-)\n\n-- \n2.21.0\n\n"},{"id":"370787","messageId":"a7f9e9be5fb169e8f67fc91f62e17648535b64cd.1551853194.git.martin.agren@gmail.com","threadId":"50664","inReplyTo":"cover.1551853194.git.martin.agren@gmail.com","subject":"[PATCH 3/5] git.txt: remove empty line before list continuation","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-03-06T06:30:16Z","receivedAt":"2019-03-06T06:30:45Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"This patch is a no-op for Asciidoctor, but makes AsciiDoc render this as\nintended.\n\nSigned-off-by: Martin Ågren \n---\n Documentation/git.txt | 1 -\n 1 file changed, 1 deletion(-)\n\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 00156d64aa..6d1f2fd9ae 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -536,7 +536,6 @@ other\n \tThe command-line parameters passed to the configured command are\n \tdetermined by the ssh variant. See `ssh.variant` option in\n \tlinkgit:git-config[1] for details.\n-\n +\n `$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted\n by the shell, which allows additional arguments to be included.\n-- \n2.21.0\n\n"},{"id":"370788","messageId":"4348f7b1b661181b90bf25f43c07529fa9757422.1551853194.git.martin.agren@gmail.com","threadId":"50664","inReplyTo":"cover.1551853194.git.martin.agren@gmail.com","subject":"[PATCH 5/5] Documentation: turn middle-of-line tabs into spaces","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-03-06T06:30:18Z","receivedAt":"2019-03-06T06:31:19Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"These tabs happen to appear in columns where they don't stand out too\nmuch, so the diff here is non-obvious. Some of these are rendered\ndifferently by AsciiDoc and Asciidoctor (although the difference might\nbe invisible!), which is how I found a few of them. The remainder were\nfound using `git grep \"[a-zA-Z.,)]$TAB[a-zA-Z]\"`.\n\nSigned-off-by: Martin Ågren \n---\n Documentation/config/diff.txt | 2 +-\n Documentation/config/gc.txt | 2 +-\n Documentation/config/gpg.txt | 2 +-\n Documentation/git-config.txt | 2 +-\n Documentation/git-grep.txt | 2 +-\n Documentation/git-http-backend.txt | 2 +-\n Documentation/git-ls-remote.txt | 2 +-\n Documentation/git-notes.txt | 2 +-\n Documentation/gitattributes.txt | 2 +-\n Documentation/gitremote-helpers.txt | 2 +-\n Documentation/gitweb.conf.txt | 2 +-\n Documentation/rev-list-options.txt | 2 +-\n 12 files changed, 12 insertions(+), 12 deletions(-)\n\ndiff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt\nindex 7a1bae116a..2c4c9ba27a 100644\n--- a/Documentation/config/diff.txt\n+++ b/Documentation/config/diff.txt\n@@ -73,7 +73,7 @@ diff.external::\n \tenvironment variable. The command is called with parameters\n \tas described under \"git Diffs\" in linkgit:git[1]. Note: if\n \tyou want to use an external diff program only on a subset of\n-\tyour files, you\tmight want to use linkgit:gitattributes[5] instead.\n+\tyour files, you might want to use linkgit:gitattributes[5] instead.\n \n diff.ignoreSubmodules::\n \tSets the default value of --ignore-submodules. Note that this\ndiff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt\nindex c6fbb8a96f..73c08b0c00 100644\n--- a/Documentation/config/gc.txt\n+++ b/Documentation/config/gc.txt\n@@ -19,7 +19,7 @@ gc.autoPackLimit::\n \tWhen there are more than this many packs that are not\n \tmarked with `*.keep` file in the repository, `git gc\n \t--auto` consolidates them into one larger pack. The\n-\tdefault\tvalue is 50. Setting this to 0 disables it.\n+\tdefault value is 50. Setting this to 0 disables it.\n \n gc.autoDetach::\n \tMake `git gc --auto` return immediately and run in background\ndiff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt\nindex 590fe0d4ba..f999f8ea49 100644\n--- a/Documentation/config/gpg.txt\n+++ b/Documentation/config/gpg.txt\n@@ -16,5 +16,5 @@ gpg.format::\n gpg..program::\n \tUse this to customize the program used for the signing format you\n \tchose. (see `gpg.program` and `gpg.format`) `gpg.program` can still\n-\tbe used as a legacy synonym for\t`gpg.openpgp.program`. The default\n+\tbe used as a legacy synonym for `gpg.openpgp.program`. The default\n \tvalue for `gpg.x509.program` is \"gpgsm\".\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 1bfe9f56a7..7d857f34c6 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -126,7 +126,7 @@ See also <>.\n \n --local::\n \tFor writing options: write to the repository `.git/config` file.\n-\tThis is\tthe default behavior.\n+\tThis is the default behavior.\n +\n For reading options: read only from the repository `.git/config` rather than\n from all available files.\ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\nindex 84fe236a8e..2d27969057 100644\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -88,7 +88,7 @@ OPTIONS\n \tmechanism. Only useful with `--untracked`.\n \n --exclude-standard::\n-\tDo not pay attention to ignored files specified via the\t`.gitignore`\n+\tDo not pay attention to ignored files specified via the `.gitignore`\n \tmechanism. Only useful when searching files in the current directory\n \twith `--no-index`.\n \ndiff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt\nindex bb0db195ce..558966aa83 100644\n--- a/Documentation/git-http-backend.txt\n+++ b/Documentation/git-http-backend.txt\n@@ -162,7 +162,7 @@ ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage.\n \n Accelerated static Apache 2.x::\n \tSimilar to the above, but Apache can be used to return static\n-\tfiles that are stored on disk.\tOn many systems this may\n+\tfiles that are stored on disk. On many systems this may\n \tbe more efficient as Apache can ask the kernel to copy the\n \tfile contents from the file system directly to the network:\n +\ndiff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt\nindex b9fd3770a6..0b057cbb10 100644\n--- a/Documentation/git-ls-remote.txt\n+++ b/Documentation/git-ls-remote.txt\n@@ -31,7 +31,7 @@ OPTIONS\n \tdisplayed.\n \n --refs::\n-\tDo not show peeled tags or pseudorefs like HEAD\tin the output.\n+\tDo not show peeled tags or pseudorefs like `HEAD` in the output.\n \n -q::\n --quiet::\ndiff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt\nindex df2b64dbb6..f56a5a9197 100644\n--- a/Documentation/git-notes.txt\n+++ b/Documentation/git-notes.txt\n@@ -146,7 +146,7 @@ OPTIONS\n \n -C ::\n --reuse-message=::\n-\tTake the given blob object (for\texample, another note) as the\n+\tTake the given blob object (for example, another note) as the\n \tnote message. (Use `git notes copy ` instead to\n \tcopy notes between objects.)\n \ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex b8392fc330..c2c10eef7c 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -18,7 +18,7 @@ A `gitattributes` file is a simple text file that gives\n \n Each line in `gitattributes` file is of form:\n \n-\tpattern\tattr1 attr2 ...\n+\tpattern attr1 attr2 ...\n \n That is, a pattern followed by an attributes list,\n separated by whitespaces. Leading and trailing whitespaces are\ndiff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt\nindex 9d1459aac6..4f2905dc5d 100644\n--- a/Documentation/gitremote-helpers.txt\n+++ b/Documentation/gitremote-helpers.txt\n@@ -468,7 +468,7 @@ set by Git if the remote helper has the 'option' capability.\n \n 'option dry-run' {'true'|'false'}:\n \tIf true, pretend the operation completed successfully,\n-\tbut don't actually change any repository data.\tFor most\n+\tbut don't actually change any repository data. For most\n \thelpers this only applies to the 'push', if supported.\n \n 'option servpath '::\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex c0a326e388..57e50b6911 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -536,7 +536,7 @@ $omit_owner::\n \n $per_request_config::\n \tIf this is set to code reference, it will be run once for each request.\n-\tYou can\tset parts of configuration that change per session this way.\n+\tYou can set parts of configuration that change per session this way.\n \tFor example, one might use the following code in a gitweb configuration\n \tfile\n +\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex bab5f50b17..918749b890 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -742,7 +742,7 @@ is supported, which omits all blobs and trees.\n \n --filter-print-omitted::\n \tOnly useful with `--filter=`; prints a list of the objects omitted\n-\tby the filter.\tObject IDs are prefixed with a ``~'' character.\n+\tby the filter. Object IDs are prefixed with a ``~'' character.\n \n --missing=::\n \tA debug option to help with future \"partial clone\" development.\n-- \n2.21.0\n\n"},{"id":"370789","messageId":"1864fee16647f526b507dcebca90629b37cc35a1.1551853194.git.martin.agren@gmail.com","threadId":"50664","inReplyTo":"cover.1551853194.git.martin.agren@gmail.com","subject":"[PATCH 4/5] git-svn.txt: drop escaping '\\' that ends up being rendered","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-03-06T06:30:17Z","receivedAt":"2019-03-06T06:31:29Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Escaping two *'s as \"\\*\\*\" apparently makes Asciidoctor render the\nsecond backslash literally, so we end up with \"*\\*\". So let's not escape\nthat second asterisk. The result is now \"**\" as intended, both in\nAsciiDoc and Asciidoctor.\n\nSigned-off-by: Martin Ågren \n---\n Documentation/git-svn.txt | 10 +++++-----\n 1 file changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt\nindex b99029520d..223788fa3e 100644\n--- a/Documentation/git-svn.txt\n+++ b/Documentation/git-svn.txt\n@@ -126,7 +126,7 @@ your Perl's Getopt::Long is < v2.37).\n \tcommand-line argument.\n +\n This automatically updates the rev_map if needed (see\n-'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details).\n+'$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details).\n \n --localtime;;\n \tStore Git commit times in the local time zone instead of UTC. This\n@@ -239,7 +239,7 @@ Like 'git rebase'; this requires that the working tree be clean\n and have no uncommitted changes.\n +\n This automatically updates the rev_map if needed (see\n-'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details).\n+'$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details).\n \n -l;;\n --local;;\n@@ -524,7 +524,7 @@ This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file\n \tway to repair the repo is to use 'reset'.\n +\n Only the rev_map and refs/remotes/git-svn are changed (see\n-'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details).\n+'$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details).\n Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to\n move local branches onto the new tree.\n \n@@ -760,7 +760,7 @@ svn-remote..noMetadata::\n +\n This option can only be used for one-shot imports as 'git svn'\n will not be able to fetch again without metadata. Additionally,\n-if you lose your '$GIT_DIR/svn/\\*\\*/.rev_map.*' files, 'git svn' will not\n+if you lose your '$GIT_DIR/svn/\\**/.rev_map.*' files, 'git svn' will not\n be able to rebuild them.\n +\n The 'git svn log' command will not work on repositories using\n@@ -1154,7 +1154,7 @@ fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove\n \n FILES\n -----\n-$GIT_DIR/svn/\\*\\*/.rev_map.*::\n+$GIT_DIR/svn/\\**/.rev_map.*::\n \tMapping between Subversion revision numbers and Git commit\n \tnames. In a repository where the noMetadata option is not set,\n \tthis can be rebuilt from the git-svn-id: lines that are at the\n-- \n2.21.0\n\n"},{"id":"370790","messageId":"d3d025240b6a7a18323173cbaeeb8dab72429904.1551853194.git.martin.agren@gmail.com","threadId":"50664","inReplyTo":"cover.1551853194.git.martin.agren@gmail.com","subject":"[PATCH 2/5] config/fsck.txt: avoid starting line with dash","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-03-06T06:30:15Z","receivedAt":"2019-03-06T06:31:34Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"This dash at the start of the line causes Asciidoctor to trip on the\nlist continuations that follow and to render the pluses literally.\nRewrap a little to put the dash elsewhere.\n\nSigned-off-by: Martin Ågren \n---\n Documentation/config/fsck.txt | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt\nindex 879c5a29c4..450e8c38e3 100644\n--- a/Documentation/config/fsck.txt\n+++ b/Documentation/config/fsck.txt\n@@ -23,9 +23,9 @@ When `fsck.` is set, errors can be switched to warnings and\n vice versa by configuring the `fsck.` setting where the\n `` is the fsck message ID and the value is one of `error`,\n `warn` or `ignore`. For convenience, fsck prefixes the error/warning\n-with the message ID, e.g. \"missingEmail: invalid author/committer line\n-- missing email\" means that setting `fsck.missingEmail = ignore` will\n-hide that issue.\n+with the message ID, e.g. \"missingEmail: invalid author/committer\n+line - missing email\" means that setting `fsck.missingEmail = ignore`\n+will hide that issue.\n +\n In general, it is better to enumerate existing objects with problems\n with `fsck.skipList`, instead of listing the kind of breakages these\n-- \n2.21.0\n\n"},{"id":"370791","messageId":"d72eb8a53daa9e24b6f0b815827aa7d3018a2f4d.1551853194.git.martin.agren@gmail.com","threadId":"50664","inReplyTo":"cover.1551853194.git.martin.agren@gmail.com","subject":"[PATCH 1/5] config/diff.txt: drop spurious backtick","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-03-06T06:30:14Z","receivedAt":"2019-03-06T06:31:36Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Signed-off-by: Martin Ågren \n---\n Documentation/config/diff.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt\nindex e48bb987d7..7a1bae116a 100644\n--- a/Documentation/config/diff.txt\n+++ b/Documentation/config/diff.txt\n@@ -10,7 +10,7 @@ diff.autoRefreshIndex::\n \n diff.dirstat::\n \tA comma separated list of `--dirstat` parameters specifying the\n-\tdefault behavior of the `--dirstat` option to linkgit:git-diff[1]`\n+\tdefault behavior of the `--dirstat` option to linkgit:git-diff[1]\n \tand friends. The defaults can be overridden on the command line\n \t(using `--dirstat=`). The fallback defaults\n \t(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.\n-- \n2.21.0\n\n"},{"id":"370851","messageId":"xmqqr2bjo7b9.fsf@gitster-ct.c.googlers.com","threadId":"50664","inReplyTo":"4348f7b1b661181b90bf25f43c07529fa9757422.1551853194.git.martin.agren@gmail.com","subject":"Re: [PATCH 5/5] Documentation: turn middle-of-line tabs into spaces","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-07T00:29:46Z","receivedAt":"2019-03-07T00:29:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> These tabs happen to appear in columns where they don't stand out too\n> much, so the diff here is non-obvious. Some of these are rendered\n> differently by AsciiDoc and Asciidoctor (although the difference might\n> be invisible!), which is how I found a few of them. The remainder were\n> found using `git grep \"[a-zA-Z.,)]$TAB[a-zA-Z]\"`.\n\nThanks. This was a fun-to-read patch.\n\n> diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt\n> index b9fd3770a6..0b057cbb10 100644\n> --- a/Documentation/git-ls-remote.txt\n> +++ b/Documentation/git-ls-remote.txt\n> @@ -31,7 +31,7 @@ OPTIONS\n> \tdisplayed.\n> \n> --refs::\n> -\tDo not show peeled tags or pseudorefs like HEAD\tin the output.\n> +\tDo not show peeled tags or pseudorefs like `HEAD` in the output.\n\nThe quoting fix here is also good.\n"}]}