|
|
|
@ -329,7 +329,6 @@ class Git:
|
|
|
|
|
rpath,
|
|
|
|
|
"status", "--porcelain", stderr=STDOUT)
|
|
|
|
|
if git_status.success():
|
|
|
|
|
return False
|
|
|
|
|
return not any(x.strip() for x in git_status)
|
|
|
|
|
else:
|
|
|
|
|
raise GitError(
|
|
|
|
@ -354,7 +353,7 @@ class Git:
|
|
|
|
|
# оригинальная ветка
|
|
|
|
|
'origin':'origin/master'}
|
|
|
|
|
"""
|
|
|
|
|
reStatus = re.compile("^## (\w+)(?:\.\.\.(\S+)\s+\[(ahead \d+)?"
|
|
|
|
|
reStatus = re.compile("^## (\w+)(?:\.\.\.(\S+))?(?:\s+\[(ahead \d+)?"
|
|
|
|
|
"(?:, )?(behind \d+)?\])?\n?(.*|$)", re.S)
|
|
|
|
|
match = reStatus.search(data)
|
|
|
|
|
if not match:
|
|
|
|
|