{"thread":{"id":"59343","subject":"[PATCH] git-merge-tree.txt: replace spurious HTML entity","startedAt":"2023-03-04T17:08:15Z","lastAt":"2023-03-05T00:43:49Z","messageCount":3,"participants":["Andreas Schwab","Elijah Newren","Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"473007","messageId":"87y1oco3i9.fsf@igel.home","threadId":"59343","inReplyTo":null,"subject":"[PATCH] git-merge-tree.txt: replace spurious HTML entity","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2023-03-04T17:00:46Z","receivedAt":"2023-03-04T17:08:15Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Signed-off-by: Andreas Schwab \n---\n Documentation/git-merge-tree.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt\nindex 88ee942101..ffc4fbf7e8 100644\n--- a/Documentation/git-merge-tree.txt\n+++ b/Documentation/git-merge-tree.txt\n@@ -108,7 +108,7 @@ This is an integer status followed by a NUL character. The integer status is:\n \n 0: merge had conflicts\n 1: merge was clean\n- <0: something prevented the merge from running (e.g. access to repository\n+ <0: something prevented the merge from running (e.g. access to repository\n \t objects denied by filesystem)\n \n [[OIDTLT]]\n-- \n2.39.1\n\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1\n\"And now for something completely different.\"\n"},{"id":"473010","messageId":"CABPp-BEEDS=v7ouOKts83OFMxDq=F0TKO1XvHEbnmXJ+Z1WELA@mail.gmail.com","threadId":"59343","inReplyTo":"87y1oco3i9.fsf@igel.home","subject":"Re: [PATCH] git-merge-tree.txt: replace spurious HTML entity","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2023-03-04T21:50:14Z","receivedAt":"2023-03-04T21:50:32Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Sat, Mar 4, 2023 at 9:48 AM Andreas Schwab wrote:\n>\n> Signed-off-by: Andreas Schwab \n> ---\n> Documentation/git-merge-tree.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt\n> index 88ee942101..ffc4fbf7e8 100644\n> --- a/Documentation/git-merge-tree.txt\n> +++ b/Documentation/git-merge-tree.txt\n> @@ -108,7 +108,7 @@ This is an integer status followed by a NUL character. The integer status is:\n>\n> 0: merge had conflicts\n> 1: merge was clean\n> - <0: something prevented the merge from running (e.g. access to repository\n> + <0: something prevented the merge from running (e.g. access to repository\n> objects denied by filesystem)\n\nI'm sure I'm the one who put it there, but I don't remember any\ndetails. I think it unlikely I would have jumped to '<' without\ntrying '<' and hitting an error first, though maybe I really did.\nAlso, there could have been other edits since then; perhaps this was\nonly needed when other characters appeared later on the line? Or\nmaybe the '<' is only needed by asciidoc and not asciidoctor (or\nvice versa; I have no clue which I was using)? Should we add a\n\"lessthan\" field in Documentation/asciidoc.conf under \"[attributes]\"\nand use \"{lessthan}\"?\n\nOr, if this one really is spurious, should the same html entity in\nDocumentation/git-rev-list.txt be expunged as well?\n\nCc'ing brian who knows way more about asciidoc than I...\n"},{"id":"473015","messageId":"CAMP44s3Kqyrdavp1OiozNbA7k4EHCj0KiQq4d2Dyg_KZSEAUuQ@mail.gmail.com","threadId":"59343","inReplyTo":"CABPp-BEEDS=v7ouOKts83OFMxDq=F0TKO1XvHEbnmXJ+Z1WELA@mail.gmail.com","subject":"Re: [PATCH] git-merge-tree.txt: replace spurious HTML entity","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2023-03-05T00:43:21Z","receivedAt":"2023-03-05T00:43:49Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sat, Mar 4, 2023 at 4:27 PM Elijah Newren wrote:\n>\n> On Sat, Mar 4, 2023 at 9:48 AM Andreas Schwab wrote:\n> >\n> > Signed-off-by: Andreas Schwab \n> > ---\n> > Documentation/git-merge-tree.txt | 2 +-\n> > 1 file changed, 1 insertion(+), 1 deletion(-)\n> >\n> > diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt\n> > index 88ee942101..ffc4fbf7e8 100644\n> > --- a/Documentation/git-merge-tree.txt\n> > +++ b/Documentation/git-merge-tree.txt\n> > @@ -108,7 +108,7 @@ This is an integer status followed by a NUL character. The integer status is:\n> >\n> > 0: merge had conflicts\n> > 1: merge was clean\n> > - <0: something prevented the merge from running (e.g. access to repository\n> > + <0: something prevented the merge from running (e.g. access to repository\n> > objects denied by filesystem)\n>\n> I'm sure I'm the one who put it there, but I don't remember any\n> details. I think it unlikely I would have jumped to '<' without\n> trying '<' and hitting an error first, though maybe I really did.\n> Also, there could have been other edits since then; perhaps this was\n> only needed when other characters appeared later on the line? Or\n> maybe the '<' is only needed by asciidoc and not asciidoctor (or\n> vice versa; I have no clue which I was using)? Should we add a\n> \"lessthan\" field in Documentation/asciidoc.conf under \"[attributes]\"\n> and use \"{lessthan}\"?\n\nFor what it's worth I checked with both asciidoc and asciidoctor in\nmultiple output formats and < works fine. I even checked an ancient\nversion of asciidoc and it works fine.\n\nIt doesn't seem like < was ever needed, and it doesn't work because\nit's a literal section.\n\n> Or, if this one really is spurious, should the same html entity in\n> Documentation/git-rev-list.txt be expunged as well?\n\n<= is automatically replaced with ⇐ as explained in the documentation\n[1]. However, to prevent substitutions one doesn't need HTML coding,\njust doing \\<= is enough.\n\nI don't know why people try to guess what asciidoc and asciidoctor\nshould do, they both follow the same specification, and I haven't seen\na problem in git documentation caused by either one of them not\nfollowing the spec, only by git not following the spec.\n\nJust follow the spec.\n\nCheers.\n\n[1] https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/\n\n-- \nFelipe Contreras\n"}]}