[PATCH v4 05/14] remote-testgit: get rid of non-local functionality
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:55:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
This only makes sense for the python remote helpers framework. Signed-off-by: Felipe Contreras <redacted> --- git-remote-testgit | 3 --- t/t5801-remote-helpers.sh | 46 +++++++++++++++++----------------------------- 2 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/git-remote-testgit b/git-remote-testgit
index 6650402..b9810fd 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit@@ -4,9 +4,6 @@ alias="$1" url="$2" -# huh? -url="${url#file://}" - dir="$GIT_DIR/testgit/$alias" prefix="refs/testgit/$alias" refspec="refs/heads/*:${prefix}/heads/*"
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 67bc8eb..2eca42e 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh@@ -28,11 +28,6 @@ test_expect_success 'cloning from local repo' ' test_cmp public/file localclone/file ' -test_expect_success 'cloning from remote repo' ' - git clone "testgit::file://${PWD}/server" clone && - test_cmp public/file clone/file -' - test_expect_success 'create new commit on remote' ' (cd public && echo content >>file &&
@@ -45,11 +40,6 @@ test_expect_success 'pulling from local repo' ' test_cmp public/file localclone/file ' -test_expect_success 'pulling from remote remote' ' - (cd clone && git pull) && - test_cmp public/file clone/file -' - test_expect_success 'pushing to local repo' ' (cd localclone && echo content >>file &&
@@ -71,19 +61,6 @@ test_expect_success 'pushing to local repo' ' compare_refs localclone2 HEAD server2 HEAD ' -test_expect_success 'synch with changes from localclone' ' - (cd clone && - git pull) -' - -test_expect_success 'pushing remote local repo' ' - (cd clone && - echo content >>file && - git commit -a -m four && - git push) && - compare_refs clone HEAD server HEAD -' - test_expect_success 'fetch new branch' ' (cd public && git checkout -b new &&
@@ -97,6 +74,16 @@ test_expect_success 'fetch new branch' ' compare_refs public HEAD localclone FETCH_HEAD ' +test_expect_success 'bump commit in public' ' + (cd public && + git checkout master && + git pull && + echo content >>file && + git commit -a -m four && + git push) && + compare_refs public HEAD server HEAD +' + test_expect_success 'fetch multiple branches' ' (cd localclone && git fetch
@@ -106,29 +93,30 @@ test_expect_success 'fetch multiple branches' ' ' test_expect_success 'push when remote has extra refs' ' - (cd clone && + (cd localclone && + git reset --hard origin/master && echo content >>file && git commit -a -m six && git push ) && - compare_refs clone master server master + compare_refs localclone master server master ' test_expect_success 'push new branch by name' ' - (cd clone && + (cd localclone && git checkout -b new-name && echo content >>file && git commit -a -m seven && git push origin new-name ) && - compare_refs clone HEAD server refs/heads/new-name + compare_refs localclone HEAD server refs/heads/new-name ' test_expect_failure 'push new branch with old:new refspec' ' - (cd clone && + (cd localclone && git push origin new-name:new-refspec ) && - compare_refs clone HEAD server refs/heads/new-refspec + compare_refs localclone HEAD server refs/heads/new-refspec ' test_done
--
1.8.0