t5520: style fixes

Fix style funnies in early part of this test script that checks "git
pull" into an unborn branch.  The primary change is that 'chdir' to
a newly created empty test repository is now protected by being done
in a subshell to make it more robust without having to chdir back to
the original place.

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

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 227d29335020f3e52a40b03b2f933f4d63942b91..5195a218a25f26f32978f80c3a3566c3529d8e8c 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -9,36 +9,27 @@ modify () {
        mv "$2.x" "$2"
 }
 
        mv "$2.x" "$2"
 }
 

-D=`pwd`
-

 test_expect_success setup '
 test_expect_success setup '

-

        echo file >file &&
        git add file &&
        git commit -a -m original
        echo file >file &&
        git add file &&
        git commit -a -m original

-

 '
 
 test_expect_success 'pulling into void' '
 '
 
 test_expect_success 'pulling into void' '

-       mkdir cloned &&
-       cd cloned &&
-       git init &&
-       git pull ..
-'
-
-cd "$D"
-
-test_expect_success 'checking the results' '
+       git init cloned &&
+       (
+               cd cloned &&
+               git pull ..
+       ) &&

        test -f file &&
        test -f cloned/file &&
        test_cmp file cloned/file
 '
 
 test_expect_success 'pulling into void using master:master' '
        test -f file &&
        test -f cloned/file &&
        test_cmp file cloned/file
 '
 
 test_expect_success 'pulling into void using master:master' '

-       mkdir cloned-uho &&
+       git init cloned-uho &&

        (
                cd cloned-uho &&
        (
                cd cloned-uho &&

-               git init &&

                git pull .. master:master
        ) &&
        test -f file &&
                git pull .. master:master
        ) &&
        test -f file &&


@@ -71,7 +62,6 @@ test_expect_success 'pulling into void does not overwrite staged files' '
        )
 '
 
        )
 '
 

-

 test_expect_success 'pulling into void does not remove new staged files' '
        git init cloned-staged-new &&
        (
 test_expect_success 'pulling into void does not remove new staged files' '
        git init cloned-staged-new &&
        (