t5500 & t7403: lose bash-ism "local"

In t5500::check_prot_host_port_path(), diagport is not a variable used elsewhere and the function is not recursively called so this can simply lose the "local", which may not be supported by shell (besides, the function liberally clobbers other variables without making them "local"). t7403::reset_submodule_urls() overrides the "root" variable used in the test framework for no good reason; its use is not about temporarily relocating where the test repositories are created. This assignment can be made not to clobber the variable by moving them into the subshells it already uses. Its value is always $TRASH_DIRECTORY, so we could use it instead there, and this function that is called only once and its two subshells may not be necessary (instead, the caller can use "git -C $there config" and set a value that is derived from $TRASH_DIRECTORY), but this is a minimum fix that is needed to lose "local". Helped-by: John Keeping <john@keeping.me.uk> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jun 1, 2016 at 13:56 UTC e256eec79d375649ecda7cc21b527386898794a4
2 files changed +2 -3
t/t5500-fetch-pack.sh
-1
@@ -556,7 +556,6 @@ check_prot_path () {
556 }
557
558 check_prot_host_port_path () {
559 - local diagport
559 case "$2" in
560 *ssh*)
561 pp=ssh
t/t7403-submodule-sync.sh
+2 -2
@@ -62,13 +62,13 @@ test_expect_success 'change submodule' '
62 '
63
64 reset_submodule_urls () {
65 - local root
66 - root=$(pwd) &&
65 (
66 + root=$(pwd) &&
67 cd super-clone/submodule &&
68 git config remote.origin.url "$root/submodule"
69 ) &&
70 (
71 + root=$(pwd) &&
72 cd super-clone/submodule/sub-submodule &&
73 git config remote.origin.url "$root/submodule"
74 )