lib-proto-disable: variable name fix

bmwill · gitster · commit 85e42053658c · 2016-12-14T15:18:51.000-08:00
The test_proto function assigns the positional parameters to named
variables, but then still refers to "$desc" as "$1". Using $desc is
more readable and less error-prone.

Signed-off-by: Brandon Williams &lt;bmwill@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/lib-proto-disable.sh b/t/lib-proto-disable.sh
@@ -9,7 +9,7 @@ test_proto () {
 	proto=$2
 	url=$3
 
-	test_expect_success "clone $1 (enabled)" '
+	test_expect_success "clone $desc (enabled)" '
 		rm -rf tmp.git &&
 		(
 			GIT_ALLOW_PROTOCOL=$proto &&
@@ -18,7 +18,7 @@ test_proto () {
 		)
 	'
 
-	test_expect_success "fetch $1 (enabled)" '
+	test_expect_success "fetch $desc (enabled)" '
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=$proto &&
@@ -27,7 +27,7 @@ test_proto () {
 		)
 	'
 
-	test_expect_success "push $1 (enabled)" '
+	test_expect_success "push $desc (enabled)" '
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=$proto &&
@@ -36,7 +36,7 @@ test_proto () {
 		)
 	'
 
-	test_expect_success "push $1 (disabled)" '
+	test_expect_success "push $desc (disabled)" '
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=none &&
@@ -45,7 +45,7 @@ test_proto () {
 		)
 	'
 
-	test_expect_success "fetch $1 (disabled)" '
+	test_expect_success "fetch $desc (disabled)" '
 		(
 			cd tmp.git &&
 			GIT_ALLOW_PROTOCOL=none &&
@@ -54,7 +54,7 @@ test_proto () {
 		)
 	'
 
-	test_expect_success "clone $1 (disabled)" '
+	test_expect_success "clone $desc (disabled)" '
 		rm -rf tmp.git &&
 		(
 			GIT_ALLOW_PROTOCOL=none &&

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ test_proto () {`
`9`	`9`	`proto=$2`
`10`	`10`	`url=$3`
`11`	`11`
`12`		`- test_expect_success "clone $1 (enabled)" '`
	`12`	`+ test_expect_success "clone $desc (enabled)" '`
`13`	`13`	`rm -rf tmp.git &&`
`14`	`14`	`(`
`15`	`15`	`GIT_ALLOW_PROTOCOL=$proto &&`
`@@ -18,7 +18,7 @@ test_proto () {`
`18`	`18`	`)`
`19`	`19`	`'`
`20`	`20`
`21`		`- test_expect_success "fetch $1 (enabled)" '`
	`21`	`+ test_expect_success "fetch $desc (enabled)" '`
`22`	`22`	`(`
`23`	`23`	`cd tmp.git &&`
`24`	`24`	`GIT_ALLOW_PROTOCOL=$proto &&`
`@@ -27,7 +27,7 @@ test_proto () {`
`27`	`27`	`)`
`28`	`28`	`'`
`29`	`29`
`30`		`- test_expect_success "push $1 (enabled)" '`
	`30`	`+ test_expect_success "push $desc (enabled)" '`
`31`	`31`	`(`
`32`	`32`	`cd tmp.git &&`
`33`	`33`	`GIT_ALLOW_PROTOCOL=$proto &&`
`@@ -36,7 +36,7 @@ test_proto () {`
`36`	`36`	`)`
`37`	`37`	`'`
`38`	`38`
`39`		`- test_expect_success "push $1 (disabled)" '`
	`39`	`+ test_expect_success "push $desc (disabled)" '`
`40`	`40`	`(`
`41`	`41`	`cd tmp.git &&`
`42`	`42`	`GIT_ALLOW_PROTOCOL=none &&`
`@@ -45,7 +45,7 @@ test_proto () {`
`45`	`45`	`)`
`46`	`46`	`'`
`47`	`47`
`48`		`- test_expect_success "fetch $1 (disabled)" '`
	`48`	`+ test_expect_success "fetch $desc (disabled)" '`
`49`	`49`	`(`
`50`	`50`	`cd tmp.git &&`
`51`	`51`	`GIT_ALLOW_PROTOCOL=none &&`
`@@ -54,7 +54,7 @@ test_proto () {`
`54`	`54`	`)`
`55`	`55`	`'`
`56`	`56`
`57`		`- test_expect_success "clone $1 (disabled)" '`
	`57`	`+ test_expect_success "clone $desc (disabled)" '`
`58`	`58`	`rm -rf tmp.git &&`
`59`	`59`	`(`
`60`	`60`	`GIT_ALLOW_PROTOCOL=none &&`