stevo
/
.bash-git-prompt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add possibility to ignore submodules also in .bash-git-rc

Browse Source 
see also #351
master
Martin Gondermann 8 years ago
parent b1f005a8a2
commit 0bd011c725
1 changed files with 10 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      gitprompt.sh

12
gitprompt.sh
Unescape View File

@ -345,9 +345,12 @@ function setGitPrompt() {
OLD_GIT_PROMPT_SHOW_UNTRACKED_FILES=${GIT_PROMPT_SHOW_UNTRACKED_FILES} OLD_GIT_PROMPT_SHOW_UNTRACKED_FILES=${GIT_PROMPT_SHOW_UNTRACKED_FILES}
unset GIT_PROMPT_SHOW_UNTRACKED_FILES unset GIT_PROMPT_SHOW_UNTRACKED_FILES
OLD_GIT_PROMPT_IGNORE_SUBMODULES=${GIT_PROMPT_IGNORE_SUBMODULES}
unset GIT_PROMPT_IGNORE_SUBMODULES
if [[ -e "$repo/.bash-git-rc" ]]; then if [[ -e "$repo/.bash-git-rc" ]]; then
# The config file can only contain variable declarations on the form A_B=0 or G_P=all # The config file can only contain variable declarations on the form A_B=0 or G_P=all
local CONFIG_SYNTAX="^(FETCH_REMOTE_STATUS|GIT_PROMPT_SHOW_UNTRACKED_FILES|GIT_PROMPT_IGNORE)=[0-9a-z]+$" local CONFIG_SYNTAX="^(FETCH_REMOTE_STATUS|GIT_PROMPT_SHOW_UNTRACKED_FILES|GIT_PROMPT_IGNORE_SUBMODULES|GIT_PROMPT_IGNORE)=[0-9a-z]+$"
if egrep -q -v "$CONFIG_SYNTAX" "$repo/.bash-git-rc"; then if egrep -q -v "$CONFIG_SYNTAX" "$repo/.bash-git-rc"; then
echo ".bash-git-rc can only contain variable values on the form NAME=value. Ignoring file." >&2 echo ".bash-git-rc can only contain variable values on the form NAME=value. Ignoring file." >&2
else else
@ -360,6 +363,11 @@ function setGitPrompt() {
fi fi
unset OLD_GIT_PROMPT_SHOW_UNTRACKED_FILES unset OLD_GIT_PROMPT_SHOW_UNTRACKED_FILES
if [ -z "${GIT_PROMPT_IGNORE_SUBMODULES}" ]; then
GIT_PROMPT_IGNORE_SUBMODULES=${OLD_GIT_PROMPT_IGNORE_SUBMODULES}
fi
unset OLD_GIT_PROMPT_IGNORE_SUBMODULES
if [[ "$GIT_PROMPT_IGNORE" = 1 ]]; then if [[ "$GIT_PROMPT_IGNORE" = 1 ]]; then
PS1="$EMPTY_PROMPT" PS1="$EMPTY_PROMPT"
return return
@ -475,7 +483,7 @@ function updatePrompt() {
export __GIT_PROMPT_IGNORE_STASH=${GIT_PROMPT_IGNORE_STASH} export __GIT_PROMPT_IGNORE_STASH=${GIT_PROMPT_IGNORE_STASH}
export __GIT_PROMPT_SHOW_UPSTREAM=${GIT_PROMPT_SHOW_UPSTREAM} export __GIT_PROMPT_SHOW_UPSTREAM=${GIT_PROMPT_SHOW_UPSTREAM}
export __GIT_PROMPT_IGNORE_SUBMODULES=${GIT_PROMPT_IGNORE_SUBMBODULES} export __GIT_PROMPT_IGNORE_SUBMODULES=${GIT_PROMPT_IGNORE_SUBMODULES}
if [ -z "${GIT_PROMPT_SHOW_UNTRACKED_FILES}" ]; then if [ -z "${GIT_PROMPT_SHOW_UNTRACKED_FILES}" ]; then
export __GIT_PROMPT_SHOW_UNTRACKED_FILES=all export __GIT_PROMPT_SHOW_UNTRACKED_FILES=all

Write Preview
Loading…
Cancel
Save