diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-27 22:36:41 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-27 22:36:41 +0100 |
| commit | 29c20c147b489d873fb988157a37bcf96f96ab45 (patch) | |
| tree | f59c6023ffda3719086d87b025a613bdc57d0af0 /lib/git/remote.py | |
| parent | b1f32e231d391f8e6051957ad947d3659c196b2b (diff) | |
| download | gitpython-29c20c147b489d873fb988157a37bcf96f96ab45.tar.gz | |
Added special cases to test that shows we cannot yet:
handle the FETCH_HEAD case and
handle tags
System needs to be adjusted to take the FETCH_HEAD info into account to cover the tags case
Diffstat (limited to 'lib/git/remote.py')
| -rw-r--r-- | lib/git/remote.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/git/remote.py b/lib/git/remote.py index 0c779f85..7f674d73 100644 --- a/lib/git/remote.py +++ b/lib/git/remote.py @@ -68,7 +68,7 @@ class Remote(LazyMixin, Iterable): BRANCH_UPTODATE, REJECTED, FORCED_UPDATE, FAST_FORWARD, NEW_TAG, \ TAG_UPDATE, NEW_BRANCH, ERROR = [ 1 << x for x in range(1,9) ] # %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, '=' : BRANCH_UPTODATE, ' ' : FAST_FORWARD } |