MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-30 22:54:14 +00:00
Code Issues Releases Wiki Activity

Replace use of '&&' by shells.and_

Browse Source
This commit is contained in:
mcarton
2015-06-26 13:58:50 +02:00
parent b59e83cca9
commit 40fe604adc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
thefuck/rules/git_pull.py
View File

@@ -1,3 +1,6 @@
from thefuck import shells
def match(command, settings): def match(command, settings):
return ('git' in command.script return ('git' in command.script
and 'pull' in command.script and 'pull' in command.script
@@ -9,4 +12,4 @@ def get_new_command(command, settings):
branch = line.split(' ')[-1] branch = line.split(' ')[-1]
set_upstream = line.replace('<remote>', 'origin')\ set_upstream = line.replace('<remote>', 'origin')\
.replace('<branch>', branch) .replace('<branch>', branch)
return u'{} && {}'.format(set_upstream, command.script) return shells.and_(set_upstream, command.script)