diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-07-04 17:36:33 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-07-04 17:51:38 +0200 |
| commit | a22eee2325eae7d44110e4f80e5cf3dc0f3b1d9d (patch) | |
| tree | 4bf5f20828bc0cf1ceefe56d12769ce121661acb /tests | |
| parent | 1b38d9013ee0cbef63c1b1df27f9ecc250208060 (diff) | |
GitRepository.set_upstream_branch: Newer git wants a valid remote repo entry
so set one in the tests before trying to set the upstream branch.
Found with git 1.8.3.2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_GitRepository.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_GitRepository.py b/tests/test_GitRepository.py index 0e8d8d0d..8dafc2a2 100644 --- a/tests/test_GitRepository.py +++ b/tests/test_GitRepository.py @@ -186,6 +186,7 @@ def test_set_upstream_branch(): >>> os.makedirs(os.path.join(repo.git_dir, 'refs/remotes/origin')) >>> shutil.copy(os.path.join(repo.git_dir, 'refs/heads/master'), \ os.path.join(repo.git_dir, 'refs/remotes/origin/')) + >>> repo.add_remote_repo('origin', 'git://git.example.com/git/origin') >>> repo.set_upstream_branch('master', 'origin/master') >>> repo.get_upstream_branch('master') 'origin/master' @@ -195,7 +196,6 @@ def test_set_upstream_branch(): >>> repo.set_upstream_branch('foo', 'origin/bla') Traceback (most recent call last): GitRepositoryError: Branch origin/bla doesn't exist! - """ def test_get_upstream_branch(): |