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

Remove now redundant checks in git_* rules

Browse Source
This commit is contained in:
mcarton
2015-07-21 15:35:39 +02:00
parent 903abff77e
commit 98a9fb3d7d
12 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
thefuck/rules/git_add.py
View File

@@ -4,8 +4,7 @@ from thefuck import utils, shells
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script return ('did not match any file(s) known to git.' in command.stderr
and 'did not match any file(s) known to git.' in command.stderr
and "Did you forget to 'git add'?" in command.stderr) and "Did you forget to 'git add'?" in command.stderr)

2
thefuck/rules/git_branch_delete.py
View File

@@ -3,7 +3,7 @@ from thefuck import utils
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git branch -d' in command.script return ('branch -d' in command.script
and 'If you are sure you want to delete it' in command.stderr) and 'If you are sure you want to delete it' in command.stderr)

2
thefuck/rules/git_branch_list.py
View File

@@ -4,7 +4,7 @@ from thefuck import utils, shells
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
# catches "git branch list" in place of "git branch" # catches "git branch list" in place of "git branch"
return command.script.split() == 'git branch list'.split() return command.script.split()[1:] == 'branch list'.split()
@utils.git_support @utils.git_support

3
thefuck/rules/git_checkout.py
View File

@@ -5,8 +5,7 @@ from thefuck import shells, utils
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script return ('did not match any file(s) known to git.' in command.stderr
and 'did not match any file(s) known to git.' in command.stderr
and "Did you forget to 'git add'?" not in command.stderr) and "Did you forget to 'git add'?" not in command.stderr)

3
thefuck/rules/git_diff_staged.py
View File

@@ -3,8 +3,7 @@ from thefuck import utils
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script and return ('diff' in command.script and
'diff' in command.script and
'--staged' not in command.script) '--staged' not in command.script)

3
thefuck/rules/git_not_command.py
View File

@@ -4,8 +4,7 @@ from thefuck.utils import get_closest, git_support
@git_support @git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script return (" is not a git command. See 'git --help'." in command.stderr
and " is not a git command. See 'git --help'." in command.stderr
and 'Did you mean' in command.stderr) and 'Did you mean' in command.stderr)

3
thefuck/rules/git_pull.py
View File

@@ -3,8 +3,7 @@ from thefuck import shells, utils
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script return ('pull' in command.script
and 'pull' in command.script
and 'set-upstream' in command.stderr) and 'set-upstream' in command.stderr)

6
thefuck/rules/git_pull_clone.py
View File

@@ -1,11 +1,9 @@
import re from thefuck import utils
from thefuck import utils, shells
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git pull' in command.script return ('fatal: Not a git repository' in command.stderr
and 'fatal: Not a git repository' in command.stderr
and "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." in command.stderr) and "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." in command.stderr)

3
thefuck/rules/git_push.py
View File

@@ -3,8 +3,7 @@ from thefuck import utils
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script return ('push' in command.script
and 'push' in command.script
and 'set-upstream' in command.stderr) and 'set-upstream' in command.stderr)

3
thefuck/rules/git_push_force.py
View File

@@ -3,8 +3,7 @@ from thefuck import utils
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script return ('push' in command.script
and 'push' in command.script
and '! [rejected]' in command.stderr and '! [rejected]' in command.stderr
and 'failed to push some refs to' in command.stderr and 'failed to push some refs to' in command.stderr
and 'Updates were rejected because the tip of your current branch is behind' in command.stderr) and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)

3
thefuck/rules/git_push_pull.py
View File

@@ -4,8 +4,7 @@ from thefuck.shells import and_
@utils.git_support @utils.git_support
def match(command, settings): def match(command, settings):
return ('git' in command.script return ('push' in command.script
and 'push' in command.script
and '! [rejected]' in command.stderr and '! [rejected]' in command.stderr
and 'failed to push some refs to' in command.stderr and 'failed to push some refs to' in command.stderr
and 'Updates were rejected because the tip of your current branch is behind' in command.stderr) and 'Updates were rejected because the tip of your current branch is behind' in command.stderr)

2
thefuck/rules/git_stash.py
View File

@@ -5,7 +5,7 @@ from thefuck import shells, utils
def match(command, settings): def match(command, settings):
# catches "Please commit or stash them" and "Please, commit your changes or # catches "Please commit or stash them" and "Please, commit your changes or
# stash them before you can switch branches." # stash them before you can switch branches."
return 'git' in command.script and 'or stash them' in command.stderr return 'or stash them' in command.stderr
@utils.git_support @utils.git_support