diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-02 16:32:01 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-02 16:32:01 +0100 |
| commit | 6becbaf35fa2f807837284d33649ba5376b3fe21 (patch) | |
| tree | 3ffbf881b467b8ed6bfd9c6ae66654227fd3de5d /git/remote.py | |
| parent | c9d884511ed2c8e9ca96de04df835aaa6eb973eb (diff) | |
| parent | 45eb6bd22554e5dad2417d185d39fe665b7a7419 (diff) | |
| download | gitpython-6becbaf35fa2f807837284d33649ba5376b3fe21.tar.gz | |
Merge pull request #221 from initOS/0.3-improve_branch_name_parsing
[FIX] remote.fetch: branch names may contain '#' characters
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 bce11f7d..a9a74ab6 100644 --- a/git/remote.py +++ b/git/remote.py @@ -202,7 +202,7 @@ class FetchInfo(object): FAST_FORWARD, ERROR = [1 << x for x in range(8)] # %c %-*s %-*s -> %s (%s) - re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.]+\]?)\s+(.+) -> ([/\w_\+\.-]+)( \(.*\)?$)?") + re_fetch_result = re.compile("^\s*(.) (\[?[\w\s\.]+\]?)\s+(.+) -> ([/\w_\+\.\-#]+)( \(.*\)?$)?") _flag_map = {'!': ERROR, '+': FORCED_UPDATE, '-': TAG_UPDATE, '*': 0, '=': HEAD_UPTODATE, ' ': FAST_FORWARD} |