From 34cd8fbd4afce7b2beb3292f4f90ca57142f442c Mon Sep 17 00:00:00 2001
From: Warren Young <wyoung@tangentsoft.com>
Date: Mon, 29 Aug 2022 21:49:12 -0600
Subject: refactor(fossil): use `fossil branch current` supported since v2.7
(#11138)
Using the automation-friendly "fossil branch current" feature added in
Fossil 2.7 instead of ad hoc parsing of human-readable "fossil branch"
output. Not only does this fix a stray space in the output, it's more
robust against changes in command output in general.
Closes #11138
---
plugins/fossil/fossil.plugin.zsh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'plugins/fossil')
diff --git a/plugins/fossil/fossil.plugin.zsh b/plugins/fossil/fossil.plugin.zsh
index a2123f415..fadf6095d 100644
--- a/plugins/fossil/fossil.plugin.zsh
+++ b/plugins/fossil/fossil.plugin.zsh
@@ -13,12 +13,11 @@ ZSH_THEME_FOSSIL_PROMPT_DIRTY=" %{$fg_bold[red]%}✖"
ZSH_THEME_FOSSIL_PROMPT_CLEAN=" %{$fg_bold[green]%}✔"
function fossil_prompt_info() {
- local info=$(fossil branch 2>&1)
+ local branch=$(fossil branch current 2>&1)
# if we're not in a fossil repo, don't show anything
- ! command grep -q "use --repo" <<< "$info" || return
+ ! command grep -q "use --repo" <<< "$branch" || return
- local branch=$(echo $info | grep "* " | sed 's/* //g')
local changes=$(fossil changes)
local dirty="$ZSH_THEME_FOSSIL_PROMPT_CLEAN"
--
cgit v1.2.3-70-g09d2