[PATCH 03/17] Documentation: unbreak regex in show-ref manual
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:21
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted>
Signed-off-by: Jonathan Nieder <redacted>
---
Documentation/asciidoc.conf | 1 +
Documentation/git-show-ref.txt | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 6be8ba3..b5f0f29 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf@@ -16,6 +16,7 @@ plus=+ caret=^ startsb=[ endsb=] +backslash=\ tilde=~ apostrophe=' backtick=`
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index 75780d7..4696af7 100644
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt@@ -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;
--
1.7.2.2.536.g42dab.dirty