From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:38:14 +0000 (-0700)
Subject: Merge branch 'lc/shell-default-value-noexpand'
X-Git-Tag: v2.10.0-rc0~152
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5854b36c4ad53b54954abf738514bf8ae8ad53cc?hp=9f1027d18a23e7c2ae60d3fb0a943e7b3342c532

Merge branch 'lc/shell-default-value-noexpand'

Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
to set the default value, without enclosing it in double quotes.

* lc/shell-default-value-noexpand:
sh-setup: enclose setting of ${VAR=default} in double-quotes
---

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index c48139a494..85db5f1c63 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -160,8 +160,8 @@ git_pager() {
 	else
 		GIT_PAGER=cat
 	fi
-	: ${LESS=-FRX}
-	: ${LV=-c}
+	: "${LESS=-FRX}"
+	: "${LV=-c}"
 	export LESS LV
 
 	eval "$GIT_PAGER" '"$@"'
@@ -344,7 +344,7 @@ git_dir_init () {
 		echo >&2 "Unable to determine absolute path of git directory"
 		exit 1
 	}
-	: ${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}
+	: "${GIT_OBJECT_DIRECTORY="$(git rev-parse --git-path objects)"}"
 }
 
 if test -z "$NONGIT_OK"