From d97e31b4ab00480e0bd95658b8cbb210e0b5b543 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <x.fix@o2.pl>
Date: Sun, 1 Jun 2014 09:39:07 +0200
Subject: [PATCH] git prompt shouldn't export variables.

---
 share/functions/__terlar_git_prompt.fish      | 36 +++++++++----------
 .../web_config/sample_prompts/terlar.fish     |  4 +--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/share/functions/__terlar_git_prompt.fish b/share/functions/__terlar_git_prompt.fish
index afe5904c5..c440e140e 100644
--- a/share/functions/__terlar_git_prompt.fish
+++ b/share/functions/__terlar_git_prompt.fish
@@ -1,24 +1,24 @@
-set -gx fish_color_git_clean green
-set -gx fish_color_git_staged yellow
-set -gx fish_color_git_dirty red
+set -g fish_color_git_clean green
+set -g fish_color_git_staged yellow
+set -g fish_color_git_dirty red
 
-set -gx fish_color_git_added green
-set -gx fish_color_git_modified blue
-set -gx fish_color_git_renamed magenta
-set -gx fish_color_git_copied magenta
-set -gx fish_color_git_deleted red
-set -gx fish_color_git_untracked yellow
-set -gx fish_color_git_unmerged red
+set -g fish_color_git_added green
+set -g fish_color_git_modified blue
+set -g fish_color_git_renamed magenta
+set -g fish_color_git_copied magenta
+set -g fish_color_git_deleted red
+set -g fish_color_git_untracked yellow
+set -g fish_color_git_unmerged red
 
-set -gx fish_prompt_git_status_added '✚'
-set -gx fish_prompt_git_status_modified '*'
-set -gx fish_prompt_git_status_renamed '➜'
-set -gx fish_prompt_git_status_copied '⇒'
-set -gx fish_prompt_git_status_deleted '✖'
-set -gx fish_prompt_git_status_untracked '?'
-set -gx fish_prompt_git_status_unmerged '!'
+set -g fish_prompt_git_status_added '✚'
+set -g fish_prompt_git_status_modified '*'
+set -g fish_prompt_git_status_renamed '➜'
+set -g fish_prompt_git_status_copied '⇒'
+set -g fish_prompt_git_status_deleted '✖'
+set -g fish_prompt_git_status_untracked '?'
+set -g fish_prompt_git_status_unmerged '!'
 
-set -gx fish_prompt_git_status_order added modified renamed copied deleted untracked unmerged
+set -g fish_prompt_git_status_order added modified renamed copied deleted untracked unmerged
 
 function __terlar_git_prompt --description 'Write out the git prompt'
   set -l branch (git rev-parse --abbrev-ref HEAD ^/dev/null)
diff --git a/share/tools/web_config/sample_prompts/terlar.fish b/share/tools/web_config/sample_prompts/terlar.fish
index d93ba2d23..8460203dc 100644
--- a/share/tools/web_config/sample_prompts/terlar.fish
+++ b/share/tools/web_config/sample_prompts/terlar.fish
@@ -1,8 +1,8 @@
 # name: Terlar
 # author: terlar - https://github.com/terlar
 
-set -xg fish_color_user magenta
-set -xg fish_color_host yellow
+set -g fish_color_user magenta
+set -g fish_color_host yellow
 
 function fish_prompt --description 'Write out the prompt'
   set -l last_status $status