Merge branch 'master' of git://people.freedesktop.org/~hausmann/git-p4

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 7eb37838bb788dfb68361bca95860fd532276deb..93eaf2c1544b5374dbe8043c66478a0a80b0bb82 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -29,5 +29,28 @@ test_expect_success 'checking the results' '
        diff file cloned/file
 '
 
-test_done
+test_expect_success 'test . as a remote' '
+
+       git branch copy master &&
+       git config branch.copy.remote . &&
+       git config branch.copy.merge refs/heads/master &&
+       echo updated >file &&
+       git commit -a -m updated &&
+       git checkout copy &&
+       test `cat file` = file &&
+       git pull &&
+       test `cat file` = updated
+'
 
+test_expect_success 'the default remote . should not break explicit pull' '
+       git checkout -b second master^ &&
+       echo modified >file &&
+       git commit -a -m modified &&
+       git checkout copy &&
+       git reset --hard HEAD^ &&
+       test `cat file` = file &&
+       git pull . second &&
+       test `cat file` = modified
+'
+
+test_done