X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5520-pull.sh;h=243212d3dac03c19db18e9c8fcfc3b9049137cdd;hb=77e6f5bc1009aa588a3b2235758bf5be13b23d85;hp=7eb37838bb788dfb68361bca95860fd532276deb;hpb=ea44949605781d1947ba1422ee541867e7ce9b81;p=git.git diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 7eb37838b..243212d3d 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -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