fujin/thefuck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#762: handle single quotes in git_branch_exists

Browse Source 
* handle single quotes in git_branch_exists

* Fix line length

* Fix missing quotes from test
This commit is contained in:
David Hart
2018-01-05 21:25:08 +00:00
committed by Pablo Aguiar
parent 797ca1c564
commit 7c858fadb3
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
thefuck/rules/git_branch_exists.py
+3 -2
View File
@@ -7,14 +7,15 @@ from thefuck.utils import eager
@git_support
def match(command):
return ("fatal: A branch named '" in command.output
and " already exists." in command.output)
and "' already exists." in command.output)
@git_support
@eager
def get_new_command(command):
branch_name = re.findall(
r"fatal: A branch named '([^']*)' already exists.", command.output)[0]
r"fatal: A branch named '(.+)' already exists.", command.output)[0]
branch_name = branch_name.replace("'", r"\'")
new_command_templates = [['git branch -d {0}', 'git branch {0}'],
['git branch -d {0}', 'git checkout -b {0}'],
['git branch -D {0}', 'git branch {0}'],