Merge branch 'jc/symbolic-ref-no-recurse'

After checking out a "branch" that is a symbolic-ref that points at
another branch, "git symbolic-ref HEAD" reports the underlying
branch, not the symbolic-ref the user gave checkout as argument.
The command learned the "--no-recurse" option to stop after
dereferencing a symbolic-ref only once.

* jc/symbolic-ref-no-recurse:
  symbolic-ref: teach "--[no-]recurse" option
This commit is contained in:
Junio C Hamano
2022-10-21 11:37:28 -07:00
3 changed files with 35 additions and 8 deletions

View File

@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git symbolic-ref' [-m <reason>] <name> <ref>
'git symbolic-ref' [-q] [--short] <name>
'git symbolic-ref' [-q] [--short] [--no-recurse] <name>
'git symbolic-ref' --delete [-q] <name>
DESCRIPTION
@ -46,6 +46,15 @@ OPTIONS
When showing the value of <name> as a symbolic ref, try to shorten the
value, e.g. from `refs/heads/master` to `master`.
--recurse::
--no-recurse::
When showing the value of <name> as a symbolic ref, if
<name> refers to another symbolic ref, follow such a chain
of symbolic refs until the result no longer points at a
symbolic ref (`--recurse`, which is the default).
`--no-recurse` stops after dereferencing only a single level
of symbolic ref.
-m::
Update the reflog for <name> with <reason>. This is valid only
when creating or updating a symbolic ref.