From: Michael Haggerty Date: Fri, 13 Jan 2012 16:39:15 +0000 (+0100) Subject: git-show-ref: fix escaping in asciidoc source X-Git-Tag: v1.7.9-rc2~5^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6ab260809b61b622e833771fbe08874f14a7e544;p=git.git git-show-ref: fix escaping in asciidoc source Two "^" characters were incorrectly being interpreted as markup for superscripting. Fix them by writing them as attribute references "{caret}". Although a single "^" character in a paragraph cannot be misinterpreted in this way, also write other "^" characters as "{caret}" in the interest of good hygiene (unless they are in literal paragraphs, of course, in which context attribute references are not recognized). Spell "{}" consistently, namely *not* quoted as "\{\}". Since the braces are empty, they cannot be interpreted as an attribute reference, and either spelling is OK. So arbitrarily choose one variation and use it consistently. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt index 3c4589529..8dfcbe3fd 100644 --- a/Documentation/git-show-ref.txt +++ b/Documentation/git-show-ref.txt @@ -44,7 +44,7 @@ OPTIONS -d:: --dereference:: - Dereference tags into object IDs as well. They will be shown with "^{}" + Dereference tags into object IDs as well. They will be shown with "{caret}{}" appended. -s:: @@ -73,9 +73,9 @@ OPTIONS --exclude-existing[=]:: Make 'git show-ref' act as a filter that reads refs from stdin of the - form "^(?:\s)?(?:{backslash}{caret}\{\})?$" + form "{caret}(?:\s)?(?:{backslash}{caret}{})?$" and performs the following actions on each: - (1) strip "^{}" at the end of line if any; + (1) strip "{caret}{}" at the end of line if any; (2) ignore if pattern is provided and does not head-match refname; (3) warn if refname is not a well-formed refname and skip; (4) ignore if refname is a ref that exists in the local repository;