sha1_file.c: learn about index version 2

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index f841574573545fa333e00b6815ba0df7d6931273..243212d3dac03c19db18e9c8fcfc3b9049137cdd 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -17,7 +17,7 @@ test_expect_success setup '
 test_expect_success 'pulling into void' '
        mkdir cloned &&
        cd cloned &&
-       git init-db &&
+       git init &&
        git pull ..
 '
 
@@ -29,5 +29,29 @@ test_expect_success 'checking the results' '
        diff file cloned/file
 '
 
+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