Merge branch 'fc/remote-bzr'

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index bc0b5f740a6e0c9548b1cc5318899aba79efa310..f387027c05cf502c6892c7694598bef34376be92 100755 (executable)
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -63,18 +63,6 @@ test_expect_success 'fetch new branch' '
        compare_refs server HEAD local FETCH_HEAD
 '
 
-#
-# This is only needed because of a bug not detected by this script. It will be
-# fixed shortly, but for now lets not cause regressions.
-#
-test_expect_success 'bump commit in server' '
-       (cd server &&
-       git checkout master &&
-       echo content >>file &&
-       git commit -a -m four) &&
-       compare_refs server HEAD server HEAD
-'
-
 test_expect_success 'fetch multiple branches' '
        (cd local &&
         git fetch
@@ -110,4 +98,72 @@ test_expect_failure 'push new branch with old:new refspec' '
        compare_refs local HEAD server refs/heads/new-refspec
 '
 
+test_expect_success 'cloning without refspec' '
+       GIT_REMOTE_TESTGIT_REFSPEC="" \
+       git clone "testgit::${PWD}/server" local2 &&
+       compare_refs local2 HEAD server HEAD
+'
+
+test_expect_success 'pulling without refspecs' '
+       (cd local2 &&
+       git reset --hard &&
+       GIT_REMOTE_TESTGIT_REFSPEC="" git pull) &&
+       compare_refs local2 HEAD server HEAD
+'
+
+test_expect_failure 'pushing without refspecs' '
+       test_when_finished "(cd local2 && git reset --hard origin)" &&
+       (cd local2 &&
+       echo content >>file &&
+       git commit -a -m ten &&
+       GIT_REMOTE_TESTGIT_REFSPEC="" git push) &&
+       compare_refs local2 HEAD server HEAD
+'
+
+test_expect_success 'pulling with straight refspec' '
+       (cd local2 &&
+       GIT_REMOTE_TESTGIT_REFSPEC="*:*" git pull) &&
+       compare_refs local2 HEAD server HEAD
+'
+
+test_expect_failure 'pushing with straight refspec' '
+       test_when_finished "(cd local2 && git reset --hard origin)" &&
+       (cd local2 &&
+       echo content >>file &&
+       git commit -a -m eleven &&
+       GIT_REMOTE_TESTGIT_REFSPEC="*:*" git push) &&
+       compare_refs local2 HEAD server HEAD
+'
+
+test_expect_success 'pulling without marks' '
+       (cd local2 &&
+       GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
+       compare_refs local2 HEAD server HEAD
+'
+
+test_expect_failure 'pushing without marks' '
+       test_when_finished "(cd local2 && git reset --hard origin)" &&
+       (cd local2 &&
+       echo content >>file &&
+       git commit -a -m twelve &&
+       GIT_REMOTE_TESTGIT_NO_MARKS=1 git push) &&
+       compare_refs local2 HEAD server HEAD
+'
+
+test_expect_success 'push all with existing object' '
+       (cd local &&
+       git branch dup2 master &&
+       git push origin --all
+       ) &&
+       compare_refs local dup2 server dup2
+'
+
+test_expect_success 'push ref with existing object' '
+       (cd local &&
+       git branch dup master &&
+       git push origin dup
+       ) &&
+       compare_refs local dup server dup
+'
+
 test_done