diff --git a/readme.md b/readme.md index 01cd53d..1de0be2 100644 --- a/readme.md +++ b/readme.md @@ -83,4 +83,4 @@ Each test case below corresponds to a buggy-to-fixed repository pair. - thefuck_9 - Related issues: - https://github.com/nvbn/thefuck/pull/559 - - https://github.com/nvbn/thefuck/issues/558 \ No newline at end of file + - https://github.com/nvbn/thefuck/issues/558 diff --git a/thefuck_5/tests/rules/test_git_push.py b/thefuck_5/tests/rules/test_git_push.py index b6aa7c6..cf45f4e 100644 --- a/thefuck_5/tests/rules/test_git_push.py +++ b/thefuck_5/tests/rules/test_git_push.py @@ -15,19 +15,6 @@ def output(branch_name): '''.format(branch_name, branch_name) -@pytest.fixture -def output_bitbucket(): - return '''Total 0 (delta 0), reused 0 (delta 0) -remote: -remote: Create pull request for feature/set-upstream: -remote: https://bitbucket.org/set-upstream -remote: -To git@bitbucket.org:test.git - e5e7fbb..700d998 feature/set-upstream -> feature/set-upstream -Branch feature/set-upstream set up to track remote branch feature/set-upstream from origin. -''' - - @pytest.mark.parametrize('script, branch_name', [ ('git push', 'master'), ('git push origin', 'master')]) @@ -35,10 +22,6 @@ def test_match(output, script, branch_name): assert match(Command(script, output)) -def test_match_bitbucket(output_bitbucket): - assert not match(Command('git push origin', output_bitbucket)) - - @pytest.mark.parametrize('script, branch_name', [ ('git push master', None), ('ls', 'master')]) diff --git a/thefuck_5/thefuck/rules/git_push.py b/thefuck_5/thefuck/rules/git_push.py index cccee67..551b25d 100644 --- a/thefuck_5/thefuck/rules/git_push.py +++ b/thefuck_5/thefuck/rules/git_push.py @@ -6,7 +6,7 @@ @git_support def match(command): return ('push' in command.script_parts - and 'git push --set-upstream' in command.output) + and 'set-upstream' in command.output) def _get_upstream_option_index(command_parts):