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

Merge branch 'git-push-u' of https://github.com/josephfrazier/thefuck into josephfrazier-git-push-u

Browse Source
This commit is contained in:
Vladimir Iakovlev 2016-10-07 10:40:02 +02:00
commit cf3acbfa2e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/rules/test_git_push.py
View File

@ -23,6 +23,8 @@ def test_match(stderr):
def test_get_new_command(stderr): def test_get_new_command(stderr):
assert get_new_command(Command('git push', stderr=stderr))\ assert get_new_command(Command('git push', stderr=stderr))\
== "git push --set-upstream origin master" == "git push --set-upstream origin master"
assert get_new_command(Command('git push -u', stderr=stderr))\
== "git push --set-upstream origin master"
assert get_new_command(Command('git push -u origin', stderr=stderr))\ assert get_new_command(Command('git push -u origin', stderr=stderr))\
== "git push --set-upstream origin master" == "git push --set-upstream origin master"
assert get_new_command(Command('git push --set-upstream origin', stderr=stderr))\ assert get_new_command(Command('git push --set-upstream origin', stderr=stderr))\

4
thefuck/rules/git_push.py
View File

@ -24,7 +24,11 @@ def get_new_command(command):
pass pass
if upstream_option_index is not -1: if upstream_option_index is not -1:
command.script_parts.pop(upstream_option_index) command.script_parts.pop(upstream_option_index)
try:
command.script_parts.pop(upstream_option_index) command.script_parts.pop(upstream_option_index)
except IndexError:
# This happens for `git push -u`
pass
push_upstream = command.stderr.split('\n')[-3].strip().partition('git ')[2] push_upstream = command.stderr.split('\n')[-3].strip().partition('git ')[2]
return replace_argument(" ".join(command.script_parts), 'push', push_upstream) return replace_argument(" ".join(command.script_parts), 'push', push_upstream)