mirror of
https://github.com/nvbn/thefuck.git
synced 2025-01-31 10:11:14 +00:00
Merge branch 'master' of github.com:nvbn/thefuck
This commit is contained in:
commit
cc9af78787
@ -219,7 +219,7 @@ Enabled by default only on specific platforms:
|
|||||||
|
|
||||||
Bundled, but not enabled by default:
|
Bundled, but not enabled by default:
|
||||||
|
|
||||||
* `git_push_force` – adds `--force` to a `git push` (may conflict with `git_push_pull`);
|
* `git_push_force` – adds `--force-with-lease` to a `git push` (may conflict with `git_push_pull`);
|
||||||
* `rm_root` – adds `--no-preserve-root` to `rm -rf /` command.
|
* `rm_root` – adds `--no-preserve-root` to `rm -rf /` command.
|
||||||
|
|
||||||
## Creating your own rules
|
## Creating your own rules
|
||||||
|
@ -45,8 +45,8 @@ def test_not_match(command):
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('command, output', [
|
@pytest.mark.parametrize('command, output', [
|
||||||
(Command(script='git push', stderr=git_err), 'git push --force'),
|
(Command(script='git push', stderr=git_err), 'git push --force-with-lease'),
|
||||||
(Command(script='git push nvbn', stderr=git_err), 'git push --force nvbn'),
|
(Command(script='git push nvbn', stderr=git_err), 'git push --force-with-lease nvbn'),
|
||||||
(Command(script='git push nvbn master', stderr=git_err), 'git push --force nvbn master')])
|
(Command(script='git push nvbn master', stderr=git_err), 'git push --force-with-lease nvbn master')])
|
||||||
def test_get_new_command(command, output):
|
def test_get_new_command(command, output):
|
||||||
assert get_new_command(command) == output
|
assert get_new_command(command) == output
|
||||||
|
@ -12,7 +12,7 @@ def match(command):
|
|||||||
|
|
||||||
@git_support
|
@git_support
|
||||||
def get_new_command(command):
|
def get_new_command(command):
|
||||||
return replace_argument(command.script, 'push', 'push --force')
|
return replace_argument(command.script, 'push', 'push --force-with-lease')
|
||||||
|
|
||||||
|
|
||||||
enabled_by_default = False
|
enabled_by_default = False
|
||||||
|
Loading…
x
Reference in New Issue
Block a user