From 768c1dfe8b5cb521c004518268acdad65a11272d Mon Sep 17 00:00:00 2001 From: Forrest Hopkins Date: Tue, 23 Aug 2016 21:10:52 -0700 Subject: [PATCH 1/4] Update Remotes section The Remotes section was missing some pretty important info --- git/test/test_docs.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/git/test/test_docs.py b/git/test/test_docs.py index a4604c584..23c003a3f 100644 --- a/git/test/test_docs.py +++ b/git/test/test_docs.py @@ -373,8 +373,13 @@ def test_references_and_objects(self, rw_dir): assert origin == empty_repo.remotes.origin == empty_repo.remotes['origin'] origin.fetch() # assure we actually have data. fetch() returns useful information # Setup a local tracking branch of a remote branch - empty_repo.create_head('master', origin.refs.master).set_tracking_branch(origin.refs.master) - origin.rename('new_origin') # rename remotes + empty_repo.create_head('master', origin.refs.master) # create local branch "master" from remote branch "master" + empty_repo.heads.master.set_tracking_branch(origin.refs.master) # set local "master" to track remote "master + empty_repo.heads.master.checkout() # checkout local "master" to working tree + # Three above commands in one: + empty_repo.create_head('master', origin.refs.master().set_tracking_branch(origin.refs.master).checkout() + # rename remotes + origin.rename('new_origin') # push and pull behaves similarly to `git push|pull` origin.pull() origin.push() From e6a9a9d83979ac447c6c5713c046585af84f728c Mon Sep 17 00:00:00 2001 From: Forrest Hopkins Date: Tue, 23 Aug 2016 21:13:00 -0700 Subject: [PATCH 2/4] Fixed open parenthesis --- git/test/test_docs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/test/test_docs.py b/git/test/test_docs.py index 23c003a3f..b65faedc6 100644 --- a/git/test/test_docs.py +++ b/git/test/test_docs.py @@ -377,7 +377,7 @@ def test_references_and_objects(self, rw_dir): empty_repo.heads.master.set_tracking_branch(origin.refs.master) # set local "master" to track remote "master empty_repo.heads.master.checkout() # checkout local "master" to working tree # Three above commands in one: - empty_repo.create_head('master', origin.refs.master().set_tracking_branch(origin.refs.master).checkout() + empty_repo.create_head('master'), origin.refs.master().set_tracking_branch(origin.refs.master).checkout() # rename remotes origin.rename('new_origin') # push and pull behaves similarly to `git push|pull` From bfff7ef8a32f1ff3d91f65404a5828faa2a6966b Mon Sep 17 00:00:00 2001 From: Forrest Hopkins Date: Tue, 23 Aug 2016 21:30:12 -0700 Subject: [PATCH 3/4] Fixed stupid mistakes I do silly things sometimes, thank goodness for Travis. This probably won't be the last fix before the test passes. --- git/test/test_docs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git/test/test_docs.py b/git/test/test_docs.py index b65faedc6..fd1f247b2 100644 --- a/git/test/test_docs.py +++ b/git/test/test_docs.py @@ -373,11 +373,11 @@ def test_references_and_objects(self, rw_dir): assert origin == empty_repo.remotes.origin == empty_repo.remotes['origin'] origin.fetch() # assure we actually have data. fetch() returns useful information # Setup a local tracking branch of a remote branch - empty_repo.create_head('master', origin.refs.master) # create local branch "master" from remote branch "master" - empty_repo.heads.master.set_tracking_branch(origin.refs.master) # set local "master" to track remote "master - empty_repo.heads.master.checkout() # checkout local "master" to working tree + empty_repo.create_head('master', origin.refs.master) # create local branch "master" from remote branch "master" + empty_repo.heads.master.set_tracking_branch(origin.refs.master) # set local "master" to track remote "master + empty_repo.heads.master.checkout() # checkout local "master" to working tree # Three above commands in one: - empty_repo.create_head('master'), origin.refs.master().set_tracking_branch(origin.refs.master).checkout() + empty_repo.create_head('master', origin.refs.master()).set_tracking_branch(origin.refs.master).checkout() # rename remotes origin.rename('new_origin') # push and pull behaves similarly to `git push|pull` From 7e0db3d5bfaacff9c62f5a0343233bda6cf4e9da Mon Sep 17 00:00:00 2001 From: Forrest Hopkins Date: Tue, 23 Aug 2016 21:33:51 -0700 Subject: [PATCH 4/4] Last fix Crossing my fingers --- git/test/test_docs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/test/test_docs.py b/git/test/test_docs.py index fd1f247b2..b297363dc 100644 --- a/git/test/test_docs.py +++ b/git/test/test_docs.py @@ -377,7 +377,7 @@ def test_references_and_objects(self, rw_dir): empty_repo.heads.master.set_tracking_branch(origin.refs.master) # set local "master" to track remote "master empty_repo.heads.master.checkout() # checkout local "master" to working tree # Three above commands in one: - empty_repo.create_head('master', origin.refs.master()).set_tracking_branch(origin.refs.master).checkout() + empty_repo.create_head('master', origin.refs.master).set_tracking_branch(origin.refs.master).checkout() # rename remotes origin.rename('new_origin') # push and pull behaves similarly to `git push|pull`