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

Merge pull request #370 from nvbn/369-git-fix-stash-fails

Browse Source 
#369 Fix `git_fix_stash` fails when script is just `git`
This commit is contained in:
Vladimir Iakovlev
2015-09-10 15:11:34 +03:00
parent 71dc2666cc 213791d3c2
commit af259846b4
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/rules/test_git_fix_stash.py
View File

@@ -23,6 +23,10 @@ def test_match(wrong):
assert match(Command(wrong, stderr=git_stash_err)) assert match(Command(wrong, stderr=git_stash_err))
def test_not_match():
assert not match(Command("git", stderr=git_stash_err))
@pytest.mark.parametrize('wrong,fixed', [ @pytest.mark.parametrize('wrong,fixed', [
('git stash opp', 'git stash pop'), ('git stash opp', 'git stash pop'),
('git stash Some message', 'git stash save Some message'), ('git stash Some message', 'git stash save Some message'),

6
thefuck/rules/git_fix_stash.py
View File

@@ -5,8 +5,12 @@ from thefuck.specific.git import git_support
@git_support @git_support
def match(command): def match(command):
return (command.script.split()[1] == 'stash' splited_script = command.script.split()
if len(splited_script) > 1:
return (splited_script[1] == 'stash'
and 'usage:' in command.stderr) and 'usage:' in command.stderr)
else:
return False
# git's output here is too complicated to be parsed (see the test file) # git's output here is too complicated to be parsed (see the test file)
stash_commands = ( stash_commands = (