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

Suggest git checkout -b (#754)

Browse Source 
This fixes https://github.com/nvbn/thefuck/issues/632

This uses `script_parts` instead of `script.startswith`
to let it work even if there's extra spaces in the command, e.g.

    git  checkout unknown
This commit is contained in:
David Hart 2018-01-01 23:30:33 +00:00 committed by Joseph Frazier
parent 9e788196e6
commit 83cf97dc26
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/rules/test_git_checkout.py
View File

@ -52,7 +52,7 @@ def test_get_branches(branches, branch_list, git_branch):
@pytest.mark.parametrize('branches, command, new_command', [ @pytest.mark.parametrize('branches, command, new_command', [
(b'', (b'',
Command('git checkout unknown', did_not_match('unknown')), Command('git checkout unknown', did_not_match('unknown')),
'git branch unknown && git checkout unknown'), 'git checkout -b unknown'),
(b'', (b'',
Command('git commit unknown', did_not_match('unknown')), Command('git commit unknown', did_not_match('unknown')),
'git branch unknown && git commit unknown'), 'git branch unknown && git commit unknown'),

2
thefuck/rules/git_checkout.py
View File

@ -34,6 +34,8 @@ def get_new_command(command):
fallback_to_first=False) fallback_to_first=False)
if closest_branch: if closest_branch:
return replace_argument(command.script, missing_file, closest_branch) return replace_argument(command.script, missing_file, closest_branch)
elif command.script_parts[1] == 'checkout':
return replace_argument(command.script, 'checkout', 'checkout -b')
else: else:
return shell.and_('git branch {}', '{}').format( return shell.and_('git branch {}', '{}').format(
missing_file, command.script) missing_file, command.script)