Use @git_support in all git_* rules

thefuck/rules/git_add.py

@@ -1,13 +1,15 @@
 import re
-from thefuck import shells
+from thefuck import utils, shells
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
             r"error: pathspec '([^']*)' "

thefuck/rules/git_branch_list.py

@@ -1,10 +1,12 @@
-from thefuck import shells
+from thefuck import utils, shells
 
 
+@utils.git_support
 def match(command, settings):
     # catches "git branch list" in place of "git branch"
     return command.script.split() == 'git branch list'.split()
 
 
+@utils.git_support
 def get_new_command(command, settings):
     return shells.and_('git branch --delete list', 'git branch')

thefuck/rules/git_checkout.py

@@ -1,13 +1,15 @@
 import re
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'did not match any file(s) known to git.' in command.stderr
             and "Did you forget to 'git add'?" not in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     missing_file = re.findall(
             r"error: pathspec '([^']*)' "

thefuck/rules/git_diff_staged.py

@@ -1,6 +1,13 @@
+from thefuck import utils
+
+
+@utils.git_support
 def match(command, settings):
-    return command.script.startswith('git d')
+    return ('git' in command.script and
+            'diff' in command.script and
+            '--staged' not in command.script)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     return '{} --staged'.format(command.script)

thefuck/rules/git_not_command.py

@@ -1,8 +1,8 @@
-from difflib import get_close_matches
 import re
-from thefuck.utils import get_closest
+from thefuck.utils import get_closest, git_support
 
 
+@git_support
 def match(command, settings):
     return ('git' in command.script
             and " is not a git command. See 'git --help'." in command.stderr
@@ -18,6 +18,7 @@ def _get_all_git_matched_commands(stderr):
             yield line.strip()
 
 
+@git_support
 def get_new_command(command, settings):
     broken_cmd = re.findall(r"git: '([^']*)' is not a git command",
                             command.stderr)[0]

thefuck/rules/git_pull.py

@@ -1,12 +1,14 @@
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'pull' in command.script
             and 'set-upstream' in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     line = command.stderr.split('\n')[-3].strip()
     branch = line.split(' ')[-1]

thefuck/rules/git_push.py

@@ -1,8 +1,13 @@
+from thefuck import utils
+
+
+@utils.git_support
 def match(command, settings):
     return ('git' in command.script
             and 'push' in command.script
             and 'set-upstream' in command.stderr)
 
 
+@utils.git_support
 def get_new_command(command, settings):
     return command.stderr.split('\n')[-3].strip()

thefuck/rules/git_stash.py

@@ -1,12 +1,14 @@
-from thefuck import shells
+from thefuck import shells, utils
 
 
+@utils.git_support
 def match(command, settings):
     # catches "Please commit or stash them" and "Please, commit your changes or
     # stash them before you can switch branches."
     return 'git' in command.script and 'or stash them' in command.stderr
 
 
+@utils.git_support
 def get_new_command(command, settings):
     formatme = shells.and_('git stash', '{}')
     return formatme.format(command.script)