From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Jul 2012 20:57:56 +0000 (-0700)
Subject: test: rename $satisfied to $satisfied_prereq
X-Git-Tag: v1.7.12.1~25^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f3cfc3b27168a085d4ca7ab5801814c4f419b54d?hp=--cc

test: rename $satisfied to $satisfied_prereq

All other shell variables that are used to globally keep track of
states related to prerequisite have "prereq" somewhere in their
names.  Be consistent and avoid potential name crashes with other
kinds of satisfaction in the future.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

f3cfc3b27168a085d4ca7ab5801814c4f419b54d
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 80daaca780..4dc027d406 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -221,9 +221,9 @@ write_script () {
 # capital letters by convention).
 
 test_set_prereq () {
-	satisfied="$satisfied$1 "
+	satisfied_prereq="$satisfied_prereq$1 "
 }
-satisfied=" "
+satisfied_prereq=" "
 
 test_have_prereq () {
 	# prerequisites can be concatenated with ','
@@ -239,7 +239,7 @@ test_have_prereq () {
 	for prerequisite
 	do
 		total_prereq=$(($total_prereq + 1))
-		case $satisfied in
+		case "$satisfied_prereq" in
 		*" $prerequisite "*)
 			ok_prereq=$(($ok_prereq + 1))
 			;;