After refactoring __git_ps1_colorize_gitstring, codepaths for bash and zsh
became mostly common and tests for bash and zsh became redundant.
Remove tests for zsh. Keep one minimal test that stress the difference
in codepaths for bash and zsh.
Suggested-by: SZEDER Gábor <sze...@ira.uka.de>
Signed-off-by: Eduardo R. D'Avila <erdav...@gmail.com>
---
1 114 t/t9903-bash-prompt.sh
t/t9903-bash-prompt.sh | 115 +------------------------------------------------
1 file changed, 1 insertion(+), 114 deletions(-)
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 6a88778..f250dfc 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -665,7 +665,7 @@ test_expect_success 'prompt - bash color pc mode -
untracked files status indica
test_cmp expected "$actual"
'
-test_expect_success 'prompt - zsh color pc mode - branch name' '
+test_expect_success 'prompt - zsh color pc mode' '
printf "BEFORE: (%%F{green}master%%f%%f):AFTER" >expected &&
(
ZSH_VERSION=5.0.0 &&
@@ -676,117 +676,4 @@ test_expect_success 'prompt - zsh color pc mode - branch
name' '
test_cmp expected "$actual"
'
-test_expect_success 'prompt - zsh color pc mode - detached head' '
- printf "BEFORE: (%%F{red}(%s...)%%f%%f):AFTER" $(git log -1
--format="%h" b1^) >expected &&
- git checkout b1^ &&
- test_when_finished "git checkout master" &&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - zsh color pc mode - dirty status indicator -
dirty worktree' '
- printf "BEFORE: (%%F{green}master%%f %%F{red}*%%f):AFTER" >expected &&
- echo "dirty" >file &&
- test_when_finished "git reset --hard" &&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWDIRTYSTATE=y &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - zsh color pc mode - dirty status indicator -
dirty index' '
- printf "BEFORE: (%%F{green}master%%f %%F{green}+%%f):AFTER" >expected &&
- echo "dirty" >file &&
- test_when_finished "git reset --hard" &&
- git add -u &&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWDIRTYSTATE=y &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - zsh color pc mode - dirty status indicator -
dirty index and worktree' '
- printf "BEFORE: (%%F{green}master%%f %%F{red}*%%F{green}+%%f):AFTER"
>expected &&
- echo "dirty index" >file &&
- test_when_finished "git reset --hard" &&
- git add -u &&
- echo "dirty worktree" >file &&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- GIT_PS1_SHOWDIRTYSTATE=y &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - zsh color pc mode - dirty status indicator -
before root commit' '
- printf "BEFORE: (%%F{green}master%%f %%F{green}#%%f):AFTER" >expected &&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWDIRTYSTATE=y &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- cd otherrepo &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - zsh color pc mode - inside .git directory' '
- printf "BEFORE: (%%F{green}GIT_DIR!%%f%%f):AFTER" >expected &&
- echo "dirty" >file &&
- test_when_finished "git reset --hard" &&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWDIRTYSTATE=y &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- cd .git &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - zsh color pc mode - stash status indicator' '
- printf "BEFORE: (%%F{green}master%%f %%F{blue}$%%f):AFTER" >expected &&
- echo 2 >file &&
- git stash &&
- test_when_finished "git stash drop" &&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWSTASHSTATE=y &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
-test_expect_success 'prompt - zsh color pc mode - untracked files status
indicator' '
- printf "BEFORE: (%%F{green}master%%f %%F{red}%%%%%%f):AFTER" >expected
&&
- (
- ZSH_VERSION=5.0.0 &&
- GIT_PS1_SHOWUNTRACKEDFILES=y &&
- GIT_PS1_SHOWCOLORHINTS=y &&
- __git_ps1 "BEFORE:" ":AFTER" &&
- printf "%s" "$PS1" >"$actual"
- ) &&
- test_cmp expected "$actual"
-'
-
test_done
--
1.8.3.1.590.g42a98dd
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
