From 8e88b29eeb9aa7c42a00a4188c6c26a17d8ad9f5 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sat, 28 May 2016 19:30:29 +0200 Subject: [PATCH] Git prompt: Shorten the sha ourselves Possibly fixes #3083. --- share/functions/__fish_git_prompt.fish | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish index 9a5be6877..4073434b0 100644 --- a/share/functions/__fish_git_prompt.fish +++ b/share/functions/__fish_git_prompt.fish @@ -592,9 +592,10 @@ function __fish_git_prompt_operation_branch_bare --description "__fish_git_promp command git describe --tags --exact-match HEAD end ^/dev/null; set os $status) if test $os -ne 0 - set -q sha; and set -l short_sha (command git rev-parse --short $sha) - if test -n "$short_sha" - set branch $short_sha... + # Shorten the sha ourselves to 8 characters - this should be good for most repositories, + # and even for large ones it should be good for most commits + if set -q sha + set branch (string match -r '^.{8}' -- $sha)... else set branch unknown end