diff options
| author | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
|---|---|---|
| committer | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
| commit | 636f77bf8d58a482df0bde8c0a6a8828950a0788 (patch) | |
| tree | e1207dbe034f82deacbb76369716779608e7056d /git/remote.py | |
| parent | 567c892322776756e8d0095e89f39b25b9b01bc2 (diff) | |
| parent | b0f79c58ad919e90261d1e332df79a4ad0bc40de (diff) | |
| download | gitpython-636f77bf8d58a482df0bde8c0a6a8828950a0788.tar.gz | |
fix conflict
Diffstat (limited to 'git/remote.py')
| -rw-r--r-- | git/remote.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git/remote.py b/git/remote.py index e17f7bb8..6ea4b2a1 100644 --- a/git/remote.py +++ b/git/remote.py @@ -612,7 +612,7 @@ class Remote(LazyMixin, Iterable): # * [would prune] origin/new_branch token = " * [would prune] " if not line.startswith(token): - raise ValueError("Could not parse git-remote prune result: %r" % line) + continue ref_name = line.replace(token, "") # sometimes, paths start with a full ref name, like refs/tags/foo, see #260 if ref_name.startswith(Reference._common_path_default + '/'): |