Skip to content

Commit

Permalink
Documentation: unbreak regex in show-ref manual
Browse files Browse the repository at this point in the history
I am not sure why, but the regular expression "(?:\^\{\})" gets
rendered by asciidoc as "(?:\{})".  The intent seems to be a regex
matching the literal string "^{}", so this rewrites the markup to
produce "(?:\^{})" as output.

Cc: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Aug 20, 2010
1 parent 438ded4 commit f100598
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions Documentation/asciidoc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ plus=&#43;
caret=&#94;
startsb=&#91;
endsb=&#93;
backslash=&#92;
tilde=&#126;
apostrophe=&#39;
backtick=&#96;
Expand Down
4 changes: 2 additions & 2 deletions Documentation/git-show-ref.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ OPTIONS
--exclude-existing[=<pattern>]::

Make 'git show-ref' act as a filter that reads refs from stdin of the
form "^(?:<anything>\s)?<refname>(?:\^\{\})?$" and performs the
following actions on each:
form "^(?:<anything>\s)?<refname>(?:{backslash}{caret}\{\})?$"
and performs the following actions on each:
(1) strip "^{}" 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;
Expand Down

0 comments on commit f100598

Please sign in to comment.