From 2d074ee14d4d892c38aff1c88fd6e3d6ca62a7f1 Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 16 Mar 2020 13:58:39 +0800 Subject: Suppress wrong status message with merged commit --- gist | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gist b/gist index 67925d7..8c0710d 100755 --- a/gist +++ b/gist @@ -242,8 +242,9 @@ _check_repo_status() { if [[ -n $(git status --short) || $(git branch | sed -n '/\* / s///p') != 'master' ]] &>/dev/null; then echo "\e[36m[working]\e[0m" else - [[ $(_blob_code "$1") != "$2" ]] 2>/dev/null && echo "\e[31m[outdated]\e[0m" - [[ -n $(git cherry) ]] 2>/dev/null && echo "\e[31m[ahead]\e[0m" + [[ $(_blob_code "$1") != "$2" ]] 2>/dev/null && local status="\e[31m[outdated]\e[0m" + [[ -n $(git cherry) ]] 2>/dev/null && local status="\e[31m[ahead]\e[0m" + echo $status fi fi } -- cgit v1.2.3-70-g09d2