MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-04-15 15:20:42 +01:00
Code Issues Releases Wiki Activity

#529: Minor style changes

Browse Source
This commit is contained in:
nvbn 2016-07-07 15:41:51 +03:00
parent 837ca73f50
commit c93b547624
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
thefuck/rules/git_push_pull.py
View File

@ -5,10 +5,13 @@ from thefuck.specific.git import git_support
@git_support @git_support
def match(command): def match(command):
return ('push' in command.script return ('push' in command.script and
and '! [rejected]' in command.stderr '! [rejected]' in command.stderr and
and 'failed to push some refs to' in command.stderr 'failed to push some refs to' in command.stderr and
and (('Updates were rejected because the tip of your current branch is behind' in command.stderr) or 'Updates were rejected because the remote contains work that you do' in command.stderr)) ('Updates were rejected because the tip of your'
' current branch is behind' in command.stderr or
'Updates were rejected because the remote '
'contains work that you do' in command.stderr))
@git_support @git_support