From 9542d56379b60bb97d17ae1d1c8e8e4bc1fd65a3 Mon Sep 17 00:00:00 2001 From: Sibo Dong Date: Sat, 31 Oct 2020 22:09:46 +0000 Subject: [PATCH] git-prompt.sh: localize `option` in __git_ps1_show_upstream The variable 'option' is used in __git_ps1_show_upstream() without being localized. This clobbers the variable the user may be using for other purposes, which is bad. Luckily, $option is not used to carry information around in the script as a global variable. The use of it in this script has very limited scope (namely, only inside this function), so just declare that it is "local". Signed-off-by: Sibo Dong Signed-off-by: Junio C Hamano --- contrib/completion/git-prompt.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 16260bab73..5116016d39 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -137,6 +137,7 @@ __git_ps1_show_upstream () done <<< "$output" # parse configuration values + local option for option in ${GIT_PS1_SHOWUPSTREAM}; do case "$option" in git|svn) upstream="$option" ;;