MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-03-14 14:48:49 +00:00
Code Issues Releases Wiki Activity

Don't add duplicate remote/branch name

Browse Source
This commit is contained in:
David 2017-12-31 16:04:20 +00:00
parent f966ecd4f5
commit 2091aacbd5
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/rules/test_git_push.py
View File

@ -27,7 +27,13 @@ def test_get_new_command(output):
== "git push --set-upstream origin master"
assert get_new_command(Command('git push -u origin', output))\
== "git push --set-upstream origin master"
assert get_new_command(Command('git push origin', output))\
== "git push --set-upstream origin master"
assert get_new_command(Command('git push --set-upstream origin', output))\
== "git push --set-upstream origin master"
assert get_new_command(Command('git push --quiet', output))\
== "git push --set-upstream origin master --quiet"
assert get_new_command(Command('git push --quiet origin', output))\
== "git push --set-upstream origin master --quiet"
assert get_new_command(Command('git -c test=test push --quiet origin', output))\
== "git -c test=test push --set-upstream origin master --quiet"

5
thefuck/rules/git_push.py
View File

@ -32,6 +32,11 @@ def get_new_command(command):
# In case of `git push -u` we don't have next argument:
if len(command_parts) > upstream_option_index:
command_parts.pop(upstream_option_index)
elif len(command_parts) > 2:
# the last permitted options are the repository and refspec; git's suggestion
# include them, so they won't be lost, but would be duplicated otherwise.
while len(command_parts) > 2 and command_parts[len(command_parts) - 1][0] != '-':
command_parts.pop(len(command_parts) - 1)
arguments = re.findall(r'git push (.*)', command.output)[0].strip()
return replace_argument(" ".join(command_parts), 'push',