Merge pull request #2800 from AnyOldName3/patch-1

Allow GIT_PS1_COMPRESSSPARSESTATE to be unset
git-for-windows · Oct 15, 2020 · 5a44efd · 5a44efd
2 parents a1a57d6 + 1a2f72a
commit 5a44efd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
@@ -431,8 +431,8 @@ __git_ps1 ()
 	fi
 
 	local sparse=""
-	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
-	   [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
+	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+	   [ -z "${GIT_PS1_OMITSPARSESTATE-}" ] &&
 	   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 		sparse="|SPARSE"
 	fi
@@ -541,7 +541,7 @@ __git_ps1 ()
 			u="%${ZSH_VERSION+%}"
 		fi
 
-		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
+		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
 		   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 			h="?"
 		fi