From 2c563348752511d2bd0c0198113d53c0483c2b88 Mon Sep 17 00:00:00 2001 From: Amanuel Nega_ Date: Mon, 15 Dec 2014 18:15:42 +0300 Subject: [PATCH 1/3] added support for ignoring untracked files --- themes/base.theme.bash | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/themes/base.theme.bash b/themes/base.theme.bash index 06c7e3cc..1c7a3795 100644 --- a/themes/base.theme.bash +++ b/themes/base.theme.bash @@ -78,8 +78,12 @@ function git_prompt_vars { SCM_GIT_AHEAD='' SCM_GIT_BEHIND='' SCM_GIT_STASH='' + SCM_GIT_ARGUMENTS='--porcelain' + if [ "$DISABLE_UNTRACKED_FILES_DIRTY" == true ]; then + SCM_GIT_ARGUMENTS="$SCM_GIT_ARGUMENTS -uno" + fi if [[ "$(git config --get bash-it.hide-status)" != "1" ]]; then - local status="$(git status -b --porcelain 2> /dev/null || git status --porcelain 2> /dev/null)" + local status="$(git status -b $SCM_GIT_ARGUMENTS 2> /dev/null || git status $SCM_GIT_ARGUMENTS 2> /dev/null)" if [[ -n "${status}" ]] && [[ "${status}" != "\n" ]] && [[ -n "$(grep -v ^# <<< "${status}")" ]]; then SCM_DIRTY=1 SCM_STATE=${GIT_THEME_PROMPT_DIRTY:-$SCM_THEME_PROMPT_DIRTY} From e21aaa8ae943c094920d7631dac4ad1b9c4b27e7 Mon Sep 17 00:00:00 2001 From: Amanuel Nega_ Date: Tue, 16 Dec 2014 10:36:36 +0300 Subject: [PATCH 2/3] added aliase to set and unset checking tracked files --- template/bash_profile.template.bash | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash index d7937a47..21a29371 100644 --- a/template/bash_profile.template.bash +++ b/template/bash_profile.template.bash @@ -23,6 +23,13 @@ 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" + + # Don't check mail when opening terminal. unset MAILCHECK From c4c62828039d9ec5f2de9bf481291b05dcbec3cb Mon Sep 17 00:00:00 2001 From: Amanuel Nega_ Date: Thu, 18 Dec 2014 10:29:44 +0300 Subject: [PATCH 3/3] 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