From 4985f75d74377c30644a97dd4816b883265c9091 Mon Sep 17 00:00:00 2001 From: Pablo Santiago Blum de Aguiar Date: Sat, 25 Jul 2015 23:25:34 -0300 Subject: [PATCH] Allow `generic_shell` to act while testing `git_push_pull` Fix failing tests on shells that do not use && operator --- thefuck/rules/git_push_pull.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/thefuck/rules/git_push_pull.py b/thefuck/rules/git_push_pull.py index 3529a182..f2174bee 100644 --- a/thefuck/rules/git_push_pull.py +++ b/thefuck/rules/git_push_pull.py @@ -1,5 +1,4 @@ -from thefuck import utils -from thefuck.shells import and_ +from thefuck import utils, shells from thefuck.utils import replace_argument @@ -13,5 +12,5 @@ def match(command, settings): @utils.git_support def get_new_command(command, settings): - return and_(replace_argument(command.script, 'push', 'pull'), - command.script) + return shells.and_(replace_argument(command.script, 'push', 'pull'), + command.script)