Skip to content

Commit 09c88be

Browse files
committed
remote: unfix fetch-infos paring of 8a2f7dc(pydev fixes)
+ Mark another TC failing when not in master.
1 parent aafde7d commit 09c88be

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

git/remote.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@ def _get_fetch_info_from_stderr(self, proc, progress):
625625
for pline in progress_handler(line):
626626
# END handle special messages
627627
for cmd in cmds:
628-
if len(pline) > 1 and pline[0] == ' ' and pline[1] == cmd:
629-
fetch_info_lines.append(pline)
628+
if len(line) > 1 and line[0] == ' ' and line[1] == cmd:
629+
fetch_info_lines.append(line)
630630
continue
631631
# end find command code
632632
# end for each comand code we know

git/test/test_repo.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,6 +909,9 @@ def test_work_tree_unsupported(self, rw_dir):
909909
rw_master = self.rorepo.clone(join_path_native(rw_dir, 'master_repo'))
910910
rw_master.git.checkout('HEAD~10')
911911
worktree_path = join_path_native(rw_dir, 'worktree_repo')
912-
rw_master.git.worktree('add', worktree_path, 'master')
912+
try:
913+
rw_master.git.worktree('add', worktree_path, 'master')
914+
except Exception as ex:
915+
raise AssertionError(ex, "It's ok if TC not running from `master`.")
913916

914917
self.failUnlessRaises(InvalidGitRepositoryError, Repo, worktree_path)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy