diff --git a/README.md b/README.md index 63c89909..53cfebae 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,7 @@ following rules are enabled by default: * `git_branch_list` – catches `git branch list` in place of `git branch` and removes created branch; * `git_checkout` – fixes branch name or creates new branch; * `git_commit_amend` – offers `git commit --amend` after previous commit; +* `git_commit_reset` – offers `git reset HEAD~` after previous commit; * `git_diff_no_index` – adds `--no-index` to previous `git diff` on untracked files; * `git_diff_staged` – adds `--staged` to previous `git diff` with unexpected output; * `git_fix_stash` – fixes `git stash` commands (misspelled subcommand and missing `save`); diff --git a/tests/rules/test_git_commit_reset.py b/tests/rules/test_git_commit_reset.py new file mode 100644 index 00000000..6f406472 --- /dev/null +++ b/tests/rules/test_git_commit_reset.py @@ -0,0 +1,25 @@ +import pytest +from thefuck.rules.git_commit_reset import match, get_new_command +from thefuck.types import Command + + +@pytest.mark.parametrize('script, output', [ + ('git commit -m "test"', 'test output'), + ('git commit', '')]) +def test_match(output, script): + assert match(Command(script, output)) + + +@pytest.mark.parametrize('script', [ + 'git branch foo', + 'git checkout feature/test_commit', + 'git push']) +def test_not_match(script): + assert not match(Command(script, '')) + + +@pytest.mark.parametrize('script', [ + ('git commit -m "test commit"'), + ('git commit')]) +def test_get_new_command(script): + assert get_new_command(Command(script, '')) == 'git reset HEAD~' diff --git a/thefuck/rules/git_commit_reset.py b/thefuck/rules/git_commit_reset.py new file mode 100644 index 00000000..bc74cb25 --- /dev/null +++ b/thefuck/rules/git_commit_reset.py @@ -0,0 +1,11 @@ +from thefuck.specific.git import git_support + + +@git_support +def match(command): + return ('commit' in command.script_parts) + + +@git_support +def get_new_command(command): + return 'git reset HEAD~'