aboutsummaryrefslogtreecommitdiff
path: root/bash/bashrc.d/prompt.bash
diff options
context:
space:
mode:
Diffstat (limited to 'bash/bashrc.d/prompt.bash')
-rw-r--r--bash/bashrc.d/prompt.bash4
1 files changed, 3 insertions, 1 deletions
diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash
index ea2ba7f2..d981bccf 100644
--- a/bash/bashrc.d/prompt.bash
+++ b/bash/bashrc.d/prompt.bash
@@ -100,10 +100,12 @@ prompt() {
[[ $(git rev-parse --is-inside-work-tree 2>/dev/null) = true ]] ||
return
- # Attempt to determine git branch, bail if we can't
+ # Find a branch label, or a tag, or just show the short commit ID,
+ # in that order of preference; if none of that works, bail out.
local branch
branch=$( {
git symbolic-ref --quiet HEAD ||
+ git describe --tags --exact-match HEAD ||
git rev-parse --short HEAD
} 2>/dev/null )
[[ -n $branch ]] || return