From 335697de72733150079acf1745ffefad2f6f1885 Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Mon, 25 Jul 2022 17:12:31 -0400 Subject: [PATCH 1/2] remove test file --- test.sh | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 test.sh diff --git a/test.sh b/test.sh deleted file mode 100755 index 2e5a14d..0000000 --- a/test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -a="asfsdfs -dfdfd -fdfff -ggg" - -grep ggg $a From 8af29c97c1239769e85a0444779cd97549301c94 Mon Sep 17 00:00:00 2001 From: Nachuan Tang Date: Mon, 25 Jul 2022 17:18:08 -0400 Subject: [PATCH 2/2] fix custom _git_ps1 bug --- bash_tools/theme_bash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_tools/theme_bash.sh b/bash_tools/theme_bash.sh index 01456e8..1bb8829 100644 --- a/bash_tools/theme_bash.sh +++ b/bash_tools/theme_bash.sh @@ -6,7 +6,7 @@ if [[ $(type -t foo) != function ]]; then local branch=`git branch 2>/dev/null | grep '*' | sed 's/* \(.*\)/\1/'` - if [ $? ]; then + if [ -n "$branch" ]; then status=`git status 2>/dev/null` local stage_info="not staged for commit" local commit_info="Changes to be committed"