From 9088c1576c25eb8ab0e8ad466c1353bcfe4fbd39 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 14 Mar 2008 21:39:40 +0100 Subject: Better analysis of git-named-revs, with truncation of starting "tags/" or "remotes/" from the result. --- 01_Functions.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/01_Functions.zsh b/01_Functions.zsh index 1b53f40..78c024d 100644 --- a/01_Functions.zsh +++ b/01_Functions.zsh @@ -68,7 +68,7 @@ get_git_branch () then # If not on a working GIT branch, get the named current commit-ish inside parenthesis [ "$my_git_branch" == "(no branch)" ] &&\ - my_git_branch="$(git-show --pretty=format:%H 2>&- | head -n1 | git-name-rev --stdin 2>&- | awk '{ print $2 }')" + my_git_branch="($(git-name-rev HEAD 2>&- | awk '{ print $2 }' | sed 's,^tags/,,;s,^remotes/,,'))" # If neither on a named commit-ish, show abbreviated commit-id [ "$my_git_branch" == "" ] &&\ -- cgit v1.2.3