Skip to content

Commit 0bd011c

Browse files
committed
Add possibility to ignore submodules also in .bash-git-rc
see also #351
1 parent b1f005a commit 0bd011c

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

gitprompt.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,12 @@ function setGitPrompt() {
345345
OLD_GIT_PROMPT_SHOW_UNTRACKED_FILES=${GIT_PROMPT_SHOW_UNTRACKED_FILES}
346346
unset GIT_PROMPT_SHOW_UNTRACKED_FILES
347347

348+
OLD_GIT_PROMPT_IGNORE_SUBMODULES=${GIT_PROMPT_IGNORE_SUBMODULES}
349+
unset GIT_PROMPT_IGNORE_SUBMODULES
350+
348351
if [[ -e "$repo/.bash-git-rc" ]]; then
349352
# The config file can only contain variable declarations on the form A_B=0 or G_P=all
350-
local CONFIG_SYNTAX="^(FETCH_REMOTE_STATUS|GIT_PROMPT_SHOW_UNTRACKED_FILES|GIT_PROMPT_IGNORE)=[0-9a-z]+$"
353+
local CONFIG_SYNTAX="^(FETCH_REMOTE_STATUS|GIT_PROMPT_SHOW_UNTRACKED_FILES|GIT_PROMPT_IGNORE_SUBMODULES|GIT_PROMPT_IGNORE)=[0-9a-z]+$"
351354
if egrep -q -v "$CONFIG_SYNTAX" "$repo/.bash-git-rc"; then
352355
echo ".bash-git-rc can only contain variable values on the form NAME=value. Ignoring file." >&2
353356
else
@@ -360,6 +363,11 @@ function setGitPrompt() {
360363
fi
361364
unset OLD_GIT_PROMPT_SHOW_UNTRACKED_FILES
362365

366+
if [ -z "${GIT_PROMPT_IGNORE_SUBMODULES}" ]; then
367+
GIT_PROMPT_IGNORE_SUBMODULES=${OLD_GIT_PROMPT_IGNORE_SUBMODULES}
368+
fi
369+
unset OLD_GIT_PROMPT_IGNORE_SUBMODULES
370+
363371
if [[ "$GIT_PROMPT_IGNORE" = 1 ]]; then
364372
PS1="$EMPTY_PROMPT"
365373
return
@@ -475,7 +483,7 @@ function updatePrompt() {
475483

476484
export __GIT_PROMPT_IGNORE_STASH=${GIT_PROMPT_IGNORE_STASH}
477485
export __GIT_PROMPT_SHOW_UPSTREAM=${GIT_PROMPT_SHOW_UPSTREAM}
478-
export __GIT_PROMPT_IGNORE_SUBMODULES=${GIT_PROMPT_IGNORE_SUBMBODULES}
486+
export __GIT_PROMPT_IGNORE_SUBMODULES=${GIT_PROMPT_IGNORE_SUBMODULES}
479487

480488
if [ -z "${GIT_PROMPT_SHOW_UNTRACKED_FILES}" ]; then
481489
export __GIT_PROMPT_SHOW_UNTRACKED_FILES=all

0 commit comments

Comments
 (0)