diff options
| author | Marc Cornellà <hello@mcornella.com> | 2022-01-13 17:46:09 +0100 |
|---|---|---|
| committer | Marc Cornellà <hello@mcornella.com> | 2022-01-13 17:46:09 +0100 |
| commit | 035c856c2cbbad2b45252ec8c065c3a9e7eefa65 (patch) | |
| tree | c584b11ba2e7dda007125029e937e64145840b15 /lib | |
| parent | 805427e06bc0549c7b9a4f50d3e39bbf68043f16 (diff) | |
| download | zsh-035c856c2cbbad2b45252ec8c065c3a9e7eefa65.tar.gz zsh-035c856c2cbbad2b45252ec8c065c3a9e7eefa65.tar.bz2 zsh-035c856c2cbbad2b45252ec8c065c3a9e7eefa65.zip | |
fix: get branch name first in `omz version` and changelog
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cli.zsh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/cli.zsh b/lib/cli.zsh index 0a85402df..ec59d1d44 100644 --- a/lib/cli.zsh +++ b/lib/cli.zsh @@ -791,12 +791,13 @@ function _omz::version { # Get the version name: # 1) try tag-like version - # 2) try name-rev - # 3) try branch name + # 2) try branch name + # 3) try name-rev (tag~<rev> or branch~<rev>) local version version=$(command git describe --tags HEAD 2>/dev/null) \ + || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null) \ || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" HEAD 2>/dev/null) \ - || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null) + || version="<detached>" # Get short hash for the current HEAD local commit=$(command git rev-parse --short HEAD 2>/dev/null) |