From 035c856c2cbbad2b45252ec8c065c3a9e7eefa65 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Thu, 13 Jan 2022 17:46:09 +0100
Subject: fix: get branch name first in `omz version` and changelog
---
lib/cli.zsh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'lib')
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)
--
cgit v1.2.3-70-g09d2