Fix, pwd outside git is not working yet :(

config.fish

@@ -35,7 +35,7 @@ set Magenta (set_color purple)     # Purple
 
 # Various variables you might want for your PS1 prompt instead
 set Time (date +%X)
-set PathShort (pwd|sed "s=$HOME=~=")  #(prompt_pwd)
+set PathShort (pwd|sed "s=$HOME=~=")
 
 # Default values for the appearance of the prompt. Configure at will.
 set GIT_PROMPT_PREFIX "("
@@ -60,7 +60,7 @@ function fish_prompt
     set _GIT_STATUS (python $gitstatus)
     set __CURRENT_GIT_STATUS $_GIT_STATUS
     set GIT_BRANCH $__CURRENT_GIT_STATUS[1]
-    set GIT_REMOTE $__CURRENT_GIT_STATUS[2]
+    set GIT_REMOTE "$__CURRENT_GIT_STATUS[2]"
     if test "." -eq $GIT_REMOTE
         set -e GIT_REMOTE
     end