From c4c62828039d9ec5f2de9bf481291b05dcbec3cb Mon Sep 17 00:00:00 2001
From: Amanuel Nega_ <negaamanuel@gmail.com>
Date: Thu, 18 Dec 2014 10:29:44 +0300
Subject: [PATCH] fixed env var name and moved aliases to git.aliases file

---
 aliases/available/git.aliases.bash  | 5 +++++
 template/bash_profile.template.bash | 8 ++------
 themes/base.theme.bash              | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index fb230ed0..e26fccb6 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -70,3 +70,8 @@ if [ -z "$EDITOR" ]; then
 else
     alias gd="git diff | $EDITOR"
 fi
+
+#Aliases to mark untracked files as dirty or not
+alias bash-it-untracked-files-dirty="export BASH_IT_GIT_UNTRACKED_FILES_DIRTY=true"
+alias bash-it-untracked-files-not-dirty="export BASH_IT_GIT_UNTRACKED_FILES_DIRTY=false"
+
diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index 21a29371..1bd35c53 100644
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -23,12 +23,8 @@ export GIT_EDITOR='/usr/bin/mate -w'
 # Set the path nginx
 export NGINX_PATH='/opt/nginx'
 
-# Set ignoring untracked files to true
-export DISABLE_UNTRACKED_FILES_DIRTY=false
-function set_disable_untracked_files() { export DISABLE_UNTRACKED_FILES_DIRTY=$@; };
-alias disable_untracked_files="export DISABLE_UNTRACKED_FILES_DIRTY=false"
-alias enable_untracked_files="export DISABLE_UNTRACKED_FILES_DIRTY=true"
-
+# Set ignoring untracked files to false
+export BASH_IT_GIT_UNTRACKED_FILES_DIRTY=true
 
 # Don't check mail when opening terminal.
 unset MAILCHECK
diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 1c7a3795..a409b686 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -79,7 +79,7 @@ function git_prompt_vars {
   SCM_GIT_BEHIND=''
   SCM_GIT_STASH=''
   SCM_GIT_ARGUMENTS='--porcelain'
-  if [ "$DISABLE_UNTRACKED_FILES_DIRTY" == true ]; then
+  if [ "$BASH_IT_GIT_UNTRACKED_FILES_DIRTY" == false ]; then
     SCM_GIT_ARGUMENTS="$SCM_GIT_ARGUMENTS -uno"
   fi
   if [[ "$(git config --get bash-it.hide-status)" != "1" ]]; then