diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 46abeded..d01c5a9f 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -498,41 +498,41 @@ _git_prompt__dirty_state ()
     _big_repo='yes'
     local line
     while IFS=$'\n' read line; do
-        if [[ "$line" =~ '^M' ]]; then
+        if [[ "$line" = M* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_MODIFIED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^A' ]]; then
+        if [[ "$line" = A* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_ADDED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^R' ]]; then
+        if [[ "$line" = R* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_RENAMED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^C' ]]; then
+        if [[ "$line" = C* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_COPIED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^D' ]]; then
+        if [[ "$line" = D* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_DELETED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
 
-        if [[ "$line" =~ '^\?\? ' ]]; then
+        if [[ "$line" = \?\?* ]]; then
             GIT_PROMPT_DIRTY_STATE_WORKTREE_UNTRACKED='yes'
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^ M' ]]; then
+        if [[ "$line" = \ M* ]]; then
             GIT_PROMPT_DIRTY_STATE_WORKTREE_MODIFIED='yes'
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes'
         fi
-        if [[ "$line" =~ '^ D' ]]; then
+        if [[ "$line" = \ D* ]]; then
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DELETED='yes'
             GIT_PROMPT_DIRTY_STATE_WORKTREE_DIRTY='yes'
         fi
 
-        if [[ "$line" =~ '^UU' ]]; then
+        if [[ "$line" = UU* ]]; then
             GIT_PROMPT_DIRTY_STATE_INDEX_UNMERGED='yes'
             GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
         fi
diff --git a/themes/ashleydev.zsh-theme b/themes/ashleydev.zsh-theme
index 992940b4..d8d3a159 100644
--- a/themes/ashleydev.zsh-theme
+++ b/themes/ashleydev.zsh-theme
@@ -115,7 +115,7 @@ update__GIT_PROMPT_INFO ()
 
     local _prompt="$b$r$s$i$p"
     # add ( ) around _prompt:
-    if [ $f = 'yes' ]; then
+    if [ "$f" = 'yes' ]; then
         _prompt="($_prompt)"
     elif [ "$u" = "yes" ]; then
         _prompt="$_Cu_dirty_($_prompt$_Cu_dirty_)"