t1020: Get rid of 'cd "$HERE"' at the start of each test

To achieve that, all cd commands which weren't inside a subshell had to
be put into a new one.

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

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 0d0da17eb8098b64c9165c8fad29baa8be17da43..a3ac33801a28fe7bd2ce67d4d4ae306c1050f5c1 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -16,12 +16,10 @@ test_expect_success setup '
        cp one original.one &&
        cp dir/two original.two
 '
        cp one original.one &&
        cp dir/two original.two
 '

-HERE=`pwd`

 LF='
 '
 
 test_expect_success 'update-index and ls-files' '
 LF='
 '
 
 test_expect_success 'update-index and ls-files' '

-       cd "$HERE" &&

        git update-index --add one &&
        case "`git ls-files`" in
        one) echo pass one ;;
        git update-index --add one &&
        case "`git ls-files`" in
        one) echo pass one ;;


@@ -42,20 +40,20 @@ test_expect_success 'update-index and ls-files' '
 '
 
 test_expect_success 'cat-file' '
 '
 
 test_expect_success 'cat-file' '

-       cd "$HERE" &&

        two=`git ls-files -s dir/two` &&
        two=`expr "$two" : "[0-7]* \\([0-9a-f]*\\)"` &&
        echo "$two" &&
        git cat-file -p "$two" >actual &&
        cmp dir/two actual &&
        two=`git ls-files -s dir/two` &&
        two=`expr "$two" : "[0-7]* \\([0-9a-f]*\\)"` &&
        echo "$two" &&
        git cat-file -p "$two" >actual &&
        cmp dir/two actual &&

-       cd dir &&
-       git cat-file -p "$two" >actual &&
-       cmp two actual
+       (
+               cd dir &&
+               git cat-file -p "$two" >actual &&
+               cmp two actual
+       )

 '
 rm -f actual dir/actual
 
 test_expect_success 'diff-files' '
 '
 rm -f actual dir/actual
 
 test_expect_success 'diff-files' '

-       cd "$HERE" &&

        echo a >>one &&
        echo d >>dir/two &&
        case "`git diff-files --name-only`" in
        echo a >>one &&
        echo d >>dir/two &&
        case "`git diff-files --name-only`" in


@@ -63,77 +61,88 @@ test_expect_success 'diff-files' '
        *) echo bad top; exit 1 ;;
        esac &&
        # diff should not omit leading paths
        *) echo bad top; exit 1 ;;
        esac &&
        # diff should not omit leading paths

-       cd dir &&
-       case "`git diff-files --name-only`" in
-       dir/two"$LF"one) echo pass subdir ;;
-       *) echo bad subdir; exit 1 ;;
-       esac &&
-       case "`git diff-files --name-only .`" in
-       dir/two) echo pass subdir limited ;;
-       *) echo bad subdir limited; exit 1 ;;
-       esac
+       (
+               cd dir &&
+               case "`git diff-files --name-only`" in
+               dir/two"$LF"one) echo pass subdir ;;
+               *) echo bad subdir; exit 1 ;;
+               esac &&
+               case "`git diff-files --name-only .`" in
+               dir/two) echo pass subdir limited ;;
+               *) echo bad subdir limited; exit 1 ;;
+               esac
+       )

 '
 
 test_expect_success 'write-tree' '
 '
 
 test_expect_success 'write-tree' '

-       cd "$HERE" &&

        top=`git write-tree` &&
        echo $top &&
        top=`git write-tree` &&
        echo $top &&

-       cd dir &&
-       sub=`git write-tree` &&
-       echo $sub &&
-       test "z$top" = "z$sub"
+       (
+               cd dir &&
+               sub=`git write-tree` &&
+               echo $sub &&
+               test "z$top" = "z$sub"
+       )

 '
 
 test_expect_success 'checkout-index' '
 '
 
 test_expect_success 'checkout-index' '

-       cd "$HERE" &&

        git checkout-index -f -u one &&
        cmp one original.one &&
        git checkout-index -f -u one &&
        cmp one original.one &&

-       cd dir &&
-       git checkout-index -f -u two &&
-       cmp two ../original.two
+       (
+               cd dir &&
+               git checkout-index -f -u two &&
+               cmp two ../original.two
+       )

 '
 
 test_expect_success 'read-tree' '
 '
 
 test_expect_success 'read-tree' '

-       cd "$HERE" &&

        rm -f one dir/two &&
        tree=`git write-tree` &&
        git read-tree --reset -u "$tree" &&
        cmp one original.one &&
        cmp dir/two original.two &&
        rm -f one dir/two &&
        tree=`git write-tree` &&
        git read-tree --reset -u "$tree" &&
        cmp one original.one &&
        cmp dir/two original.two &&

-       cd dir &&
-       rm -f two &&
-       git read-tree --reset -u "$tree" &&
-       cmp two ../original.two &&
-       cmp ../one ../original.one
+       (
+               cd dir &&
+               rm -f two &&
+               git read-tree --reset -u "$tree" &&
+               cmp two ../original.two &&
+               cmp ../one ../original.one
+       )

 '
 
 test_expect_success 'no file/rev ambiguity check inside .git' '
 '
 
 test_expect_success 'no file/rev ambiguity check inside .git' '

-       cd "$HERE" &&

        git commit -a -m 1 &&
        git commit -a -m 1 &&

-       cd "$HERE"/.git &&
-       git show -s HEAD
+       (
+               cd .git &&
+               git show -s HEAD
+       )

 '
 
 test_expect_success 'no file/rev ambiguity check inside a bare repo' '
 '
 
 test_expect_success 'no file/rev ambiguity check inside a bare repo' '

-       cd "$HERE" &&

        git clone -s --bare .git foo.git &&
        git clone -s --bare .git foo.git &&

-       cd foo.git && GIT_DIR=. git show -s HEAD
+       (
+               cd foo.git &&
+               GIT_DIR=. git show -s HEAD
+       )

 '
 
 # This still does not work as it should...
 : test_expect_success 'no file/rev ambiguity check inside a bare repo' '
 '
 
 # This still does not work as it should...
 : test_expect_success 'no file/rev ambiguity check inside a bare repo' '

-       cd "$HERE" &&

        git clone -s --bare .git foo.git &&
        git clone -s --bare .git foo.git &&

-       cd foo.git && git show -s HEAD
+       (
+               cd foo.git &&
+               git show -s HEAD
+       )

 '
 
 test_expect_success SYMLINKS 'detection should not be fooled by a symlink' '
 '
 
 test_expect_success SYMLINKS 'detection should not be fooled by a symlink' '

-       cd "$HERE" &&

        rm -fr foo.git &&
        git clone -s .git another &&
        ln -s another yetanother &&
        rm -fr foo.git &&
        git clone -s .git another &&
        ln -s another yetanother &&

-       cd yetanother/.git &&
-       git show -s HEAD
+       (
+               cd yetanother/.git &&
+               git show -s HEAD
+       )

 '
 
 test_done
 '
 
 test_done