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

Fix suggestions for git push -u origin

Browse Source 
Resolves https://github.com/nvbn/thefuck/issues/558
This commit is contained in:
Joseph Frazier 2016-09-30 16:13:50 -04:00
parent 934eeaf4fc
commit aa6b18d0ce
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
thefuck/rules/git_push.py
View File

@ -10,5 +10,21 @@ def match(command):
@git_support @git_support
def get_new_command(command): def get_new_command(command):
# If --set-upstream or -u are passed, remove it and its argument. This is
# because the remaining arguments are concatenated onto the command suggested
# by git, which includes --set-upstream and its argument
upstream_option_index = -1
try:
upstream_option_index = command.script_parts.index('--set-upstream')
except ValueError:
pass
try:
upstream_option_index = command.script_parts.index('-u')
except ValueError:
pass
if upstream_option_index is not -1:
command.script_parts.pop(upstream_option_index)
command.script_parts.pop(upstream_option_index)
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(command.script, 'push', push_upstream) return replace_argument(" ".join(command.script_parts), 'push', push_upstream)