{"thread":{"id":"29358","subject":"[PATCH v2 1/2] git-show-ref: fix escaping in asciidoc source","startedAt":"2012-01-13T16:39:14Z","lastAt":"2012-01-13T19:51:00Z","messageCount":4,"participants":["mhagger@alum.mit.edu","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":2},"messages":[{"id":"182502","messageId":"1326472756-15227-1-git-send-email-mhagger@alum.mit.edu","threadId":"29358","inReplyTo":null,"subject":"[PATCH v2 0/2] git-show-ref: fix asciidoc formatting","fromName":"","fromEmail":"mhagger@alum.mit.edu","sentAt":"2012-01-13T16:39:14Z","receivedAt":"2012-01-13T16:39:14Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"From: Michael Haggerty \n\nThis topic was discussed before [1]. I hereby try again, with a bit\nmore information in the commit messages for posterity.\n\nThe patches apply to master or maint, whatever you prefer.\n\n[1] http://comments.gmane.org/gmane.comp.version-control.git/183940\n\nMichael Haggerty (2):\n git-show-ref: fix escaping in asciidoc source\n git-show-ref doc: typeset regexp in fixed width font\n\n Documentation/git-show-ref.txt | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\n-- \n1.7.8.3\n"},{"id":"182501","messageId":"1326472756-15227-2-git-send-email-mhagger@alum.mit.edu","threadId":"29358","inReplyTo":"1326472756-15227-1-git-send-email-mhagger@alum.mit.edu","subject":"[PATCH v2 1/2] git-show-ref: fix escaping in asciidoc source","fromName":"","fromEmail":"mhagger@alum.mit.edu","sentAt":"2012-01-13T16:39:15Z","receivedAt":"2012-01-13T16:39:15Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"From: Michael Haggerty \n\nTwo \"^\" characters were incorrectly being interpreted as markup for\nsuperscripting. Fix them by writing them as attribute references\n\"{caret}\".\n\nAlthough a single \"^\" character in a paragraph cannot be\nmisinterpreted in this way, also write other \"^\" characters as\n\"{caret}\" in the interest of good hygiene (unless they are in literal\nparagraphs, of course, in which context attribute references are not\nrecognized).\n\nSpell \"{}\" consistently, namely *not* quoted as \"\\{\\}\". Since the\nbraces are empty, they cannot be interpreted as an attribute\nreference, and either spelling is OK. So arbitrarily choose one\nvariation and use it consistently.\n\nSigned-off-by: Michael Haggerty \n---\n Documentation/git-show-ref.txt | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt\nindex 3c45895..8dfcbe3 100644\n--- a/Documentation/git-show-ref.txt\n+++ b/Documentation/git-show-ref.txt\n@@ -44,7 +44,7 @@ OPTIONS\n -d::\n --dereference::\n \n-\tDereference tags into object IDs as well. They will be shown with \"^{}\"\n+\tDereference tags into object IDs as well. They will be shown with \"{caret}{}\"\n \tappended.\n \n -s::\n@@ -73,9 +73,9 @@ OPTIONS\n --exclude-existing[=]::\n \n \tMake 'git show-ref' act as a filter that reads refs from stdin of the\n-\tform \"^(?:\\s)?(?:{backslash}{caret}\\{\\})?$\"\n+\tform \"{caret}(?:\\s)?(?:{backslash}{caret}{})?$\"\n \tand performs the following actions on each:\n-\t(1) strip \"^{}\" at the end of line if any;\n+\t(1) strip \"{caret}{}\" at the end of line if any;\n \t(2) ignore if pattern is provided and does not head-match refname;\n \t(3) warn if refname is not a well-formed refname and skip;\n \t(4) ignore if refname is a ref that exists in the local repository;\n-- \n1.7.8.3\n"},{"id":"182503","messageId":"1326472756-15227-3-git-send-email-mhagger@alum.mit.edu","threadId":"29358","inReplyTo":"1326472756-15227-1-git-send-email-mhagger@alum.mit.edu","subject":"[PATCH v2 2/2] git-show-ref doc: typeset regexp in fixed width font","fromName":"","fromEmail":"mhagger@alum.mit.edu","sentAt":"2012-01-13T16:39:16Z","receivedAt":"2012-01-13T16:39:16Z","isPatch":true,"sender":{"key":"mhagger@alum.mit.edu","avatar":"https://avatars.githubusercontent.com/u/119718?v=4"},"body":"From: Michael Haggerty \n\n\nSigned-off-by: Michael Haggerty \n---\nOptional; I think it looks better.\n\n Documentation/git-show-ref.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt\nindex 8dfcbe3..fcee000 100644\n--- a/Documentation/git-show-ref.txt\n+++ b/Documentation/git-show-ref.txt\n@@ -73,7 +73,7 @@ OPTIONS\n --exclude-existing[=]::\n \n \tMake 'git show-ref' act as a filter that reads refs from stdin of the\n-\tform \"{caret}(?:\\s)?(?:{backslash}{caret}{})?$\"\n+\tform \"`{caret}(?:\\s)?(?:{backslash}{caret}{})?$`\"\n \tand performs the following actions on each:\n \t(1) strip \"{caret}{}\" at the end of line if any;\n \t(2) ignore if pattern is provided and does not head-match refname;\n-- \n1.7.8.3\n"},{"id":"182519","messageId":"7vwr8vxty3.fsf@alter.siamese.dyndns.org","threadId":"29358","inReplyTo":"1326472756-15227-3-git-send-email-mhagger@alum.mit.edu","subject":"Re: [PATCH v2 2/2] git-show-ref doc: typeset regexp in fixed width font","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-01-13T19:51:00Z","receivedAt":"2012-01-13T19:51:00Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"mhagger@alum.mit.edu writes:\n\n> From: Michael Haggerty \n>\n>\n> Signed-off-by: Michael Haggerty \n> ---\n> Optional; I think it looks better.\n\nI agree it looks better, too, as long as everybody's copy of AsciiDoc\ngroks it. I see \"``\" in many places in the other pages, so this\nshould be safe.\n\nThanks for resending. Will queue.\n"}]}