diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-04 15:46:18 +0200 |
|---|---|---|
| committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-11 18:56:04 +0200 |
| commit | 09c88bec0588522afb820ee0dc704a936484cc45 (patch) | |
| tree | e9ec87ff3ce05c66edf2a4bbe2863edaade4dbda | |
| parent | aafde7d5a8046dc718843ca4b103fcb8a790332c (diff) | |
| download | gitpython-09c88bec0588522afb820ee0dc704a936484cc45.tar.gz | |
remote: unfix fetch-infos paring of 8a2f7dce4(pydev fixes)
+ Mark another TC failing when not in master.
| -rw-r--r-- | git/remote.py | 4 | ||||
| -rw-r--r-- | git/test/test_repo.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/git/remote.py b/git/remote.py index d35e1fad..5d31a442 100644 --- a/git/remote.py +++ b/git/remote.py @@ -625,8 +625,8 @@ class Remote(LazyMixin, Iterable): for pline in progress_handler(line): # END handle special messages for cmd in cmds: - if len(pline) > 1 and pline[0] == ' ' and pline[1] == cmd: - fetch_info_lines.append(pline) + if len(line) > 1 and line[0] == ' ' and line[1] == cmd: + fetch_info_lines.append(line) continue # end find command code # end for each comand code we know diff --git a/git/test/test_repo.py b/git/test/test_repo.py index b6359ad4..2c0847e1 100644 --- a/git/test/test_repo.py +++ b/git/test/test_repo.py @@ -909,6 +909,9 @@ class TestRepo(TestBase): rw_master = self.rorepo.clone(join_path_native(rw_dir, 'master_repo')) rw_master.git.checkout('HEAD~10') worktree_path = join_path_native(rw_dir, 'worktree_repo') - rw_master.git.worktree('add', worktree_path, 'master') + try: + rw_master.git.worktree('add', worktree_path, 'master') + except Exception as ex: + raise AssertionError(ex, "It's ok if TC not running from `master`.") self.failUnlessRaises(InvalidGitRepositoryError, Repo, worktree_path) |