summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-11 21:18:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-11 21:18:38 (GMT)
commitfb628ab129dc2a29581e05edd886e3dc16a4ac49 (patch)
treef0aa80517478477d098a16245b64a0c1142699f8 /contrib/completion
parent902f358555ca048755e3b9bee6b73dbc0f5d92c6 (diff)
parent9542d56379b60bb97d17ae1d1c8e8e4bc1fd65a3 (diff)
downloadgit-fb628ab129dc2a29581e05edd886e3dc16a4ac49.zip
git-fb628ab129dc2a29581e05edd886e3dc16a4ac49.tar.gz
git-fb628ab129dc2a29581e05edd886e3dc16a4ac49.tar.bz2
Merge branch 'sd/prompt-local-variable'
Code clean-up. * sd/prompt-local-variable: git-prompt.sh: localize `option` in __git_ps1_show_upstream
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-prompt.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 54e123d..4640a15 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -138,6 +138,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" ;;