t3404 & t7508: cd inside subshell instead of around

Fixed all places where it was a straightforward change from cd'ing into a
directory and back via "cd .." to a cd inside a subshell.

Found these places with "git grep -w "cd \.\.".

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index af3b663aeee8354c6f8f2dff05666f6d70c07055..7d20a74c5ca1331ff241d1596bcb114e48a5907d 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -101,10 +101,10 @@ test_expect_success 'rebase -i with the exec command' '
 
 test_expect_success 'rebase -i with the exec command runs from tree root' '
        git checkout master &&
 
 test_expect_success 'rebase -i with the exec command runs from tree root' '
        git checkout master &&

-       mkdir subdir && cd subdir &&
+       mkdir subdir && (cd subdir &&

        FAKE_LINES="1 exec_>touch-subdir" \
        FAKE_LINES="1 exec_>touch-subdir" \

-               git rebase -i HEAD^ &&
-       cd .. &&
+               git rebase -i HEAD^
+       ) &&

        test_path_is_file touch-subdir &&
        rm -fr subdir
 '
        test_path_is_file touch-subdir &&
        rm -fr subdir
 '

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 18b07d9d36a55271b582b6fb8bf90e9e197f0622..c9300f3c8b246e3c81570532534748e510a2865f 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -808,7 +808,7 @@ test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository'
        (exit $status)
 '
 
        (exit $status)
 '
 

-(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar' && cd .. && git add sm)
+(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm

 new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 touch .gitmodules
 
 new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 touch .gitmodules