mirror of
https://github.com/git/git.git
synced 2024-11-18 19:53:58 +01:00
5162e69732
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.9 KiB
Plaintext
62 lines
1.9 KiB
Plaintext
git-symbolic-ref(1)
|
|
===================
|
|
|
|
NAME
|
|
----
|
|
git-symbolic-ref - Read and modify symbolic refs
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-symbolic-ref' [-q] [-m <reason>] <name> [<ref>]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Given one argument, reads which branch head the given symbolic
|
|
ref refers to and outputs its path, relative to the `.git/`
|
|
directory. Typically you would give `HEAD` as the <name>
|
|
argument to see on which branch your working tree is on.
|
|
|
|
Give two arguments, create or update a symbolic ref <name> to
|
|
point at the given branch <ref>.
|
|
|
|
A symbolic ref is a regular file that stores a string that
|
|
begins with `ref: refs/`. For example, your `.git/HEAD` is
|
|
a regular file whose contents is `ref: refs/heads/master`.
|
|
|
|
OPTIONS
|
|
-------
|
|
|
|
-q, --quiet::
|
|
Do not issue an error message if the <name> is not a
|
|
symbolic ref but a detached HEAD; instead exit with
|
|
non-zero status silently.
|
|
|
|
-m::
|
|
Update the reflog for <name> with <reason>. This is valid only
|
|
when creating or updating a symbolic ref.
|
|
|
|
NOTES
|
|
-----
|
|
In the past, `.git/HEAD` was a symbolic link pointing at
|
|
`refs/heads/master`. When we wanted to switch to another branch,
|
|
we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we wanted
|
|
to find out which branch we are on, we did `readlink .git/HEAD`.
|
|
This was fine, and internally that is what still happens by
|
|
default, but on platforms that do not have working symlinks,
|
|
or that do not have the `readlink(1)` command, this was a bit
|
|
cumbersome. On some platforms, `ln -sf` does not even work as
|
|
advertised (horrors). Therefore symbolic links are now deprecated
|
|
and symbolic refs are used by default.
|
|
|
|
git-symbolic-ref will exit with status 0 if the contents of the
|
|
symbolic ref were printed correctly, with status 1 if the requested
|
|
name is not a symbolic ref, or 128 if another error occurs.
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[7] suite
|