threads / patch / 61244

patchcompletion: protect prompt against unset SHOWUPSTREAM in nounset mode

Subject: [PATCH] completion: protect prompt against unset SHOWUPSTREAM in nounset mode

## tl;dr

One message between Apr 1, 2024 and Apr 1, 2024. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Ville Skyttä· Apr 1, 2024, 19:07 UTC · lore

As it stands, the only call site of `__git_ps1_show_upstream` checks that the `GIT_PS1_SHOWUPSTREAM` variable is set, so this is effectively a no-op. However, that might change, and chances of noticing the unprotected use might not be that high when it does.

Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
---
 contrib/completion/git-prompt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to contrib/completion/git-prompt.sh +1 −1
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 3826f52dec..5330e769a7 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -141,7 +141,7 @@ __git_ps1_show_upstream ()
 
 	# parse configuration values
 	local option
-	for option in ${GIT_PS1_SHOWUPSTREAM}; do
+	for option in ${GIT_PS1_SHOWUPSTREAM-}; do
 		case "$option" in
 		git|svn) upstream_type="$option" ;;
 		verbose) verbose=1 ;;
-- 
2.40.1

← back to recent threads