From 55922e4dbeedaca384e83406f2fa87c5a8e152fb Mon Sep 17 00:00:00 2001
From: Sergei Haller <sergei.haller@u-niq.com>
Date: Tue, 8 Sep 2020 11:47:05 +0200
Subject: [PATCH] #1131: Add rule for Git commit with no added files

---
 README.md                          |  1 +
 tests/rules/test_git_commit_add.py | 36 ++++++++++++++++++++++++++++++
 thefuck/rules/git_commit_add.py    | 15 +++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 tests/rules/test_git_commit_add.py
 create mode 100644 thefuck/rules/git_commit_add.py

diff --git a/README.md b/README.md
index 9c9d893d..df94d495 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,7 @@ following rules are enabled by default:
 * `git_branch_0flag` &ndash; fixes commands such as `git branch 0v` and `git branch 0r` removing the created branch;
 * `git_checkout` &ndash; fixes branch name or creates new branch;
 * `git_clone_git_clone` &ndash; replaces `git clone git clone ...` with `git clone ...`
+* `git_commit_add` &ndash; offers `git commit -a ...` after previous commit if it failed because nothing was staged;
 * `git_commit_amend` &ndash; offers `git commit --amend` after previous commit;
 * `git_commit_reset` &ndash; offers `git reset HEAD~` after previous commit;
 * `git_diff_no_index` &ndash; adds `--no-index` to previous `git diff` on untracked files;
diff --git a/tests/rules/test_git_commit_add.py b/tests/rules/test_git_commit_add.py
new file mode 100644
index 00000000..b8b07bf4
--- /dev/null
+++ b/tests/rules/test_git_commit_add.py
@@ -0,0 +1,36 @@
+import pytest
+from thefuck.rules.git_commit_add import match, get_new_command
+from thefuck.types import Command
+
+
+@pytest.mark.parametrize('script, output', [
+    ('git commit -m "test"', 'no changes added to commit'),
+    ('git commit', 'no changes added to commit')])
+def test_match(output, script):
+    assert match(Command(script, output))
+
+
+@pytest.mark.parametrize('script, output', [
+    ('git commit -m "test"', ' 1 file changed, 15 insertions(+), 14 deletions(-)')])
+def test_not_match(output, script):
+    assert not match(Command(script, output))
+
+
+@pytest.mark.parametrize('script', [
+    'git branch foo',
+    'git checkout feature/test_commit',
+    'git push'])
+def test_not_match_either(script):
+    assert not match(Command(script, ''))
+
+
+@pytest.mark.parametrize('script', [
+    ('git commit')])
+def test_get_new_command_one(script):
+    assert get_new_command(Command(script, '')) == 'git commit -a'
+
+
+@pytest.mark.parametrize('script', [
+    ('git commit -m "test commit"')])
+def test_get_new_command_two(script):
+    assert get_new_command(Command(script, '')) == 'git commit -a -m "test commit"'
diff --git a/thefuck/rules/git_commit_add.py b/thefuck/rules/git_commit_add.py
new file mode 100644
index 00000000..7d0516f6
--- /dev/null
+++ b/thefuck/rules/git_commit_add.py
@@ -0,0 +1,15 @@
+from thefuck.utils import replace_argument
+from thefuck.specific.git import git_support
+
+priority = 900  # Lower first, default is 1000
+
+
+@git_support
+def match(command):
+    return ('commit' in command.script_parts
+            and 'no changes added to commit' in command.output)
+
+
+@git_support
+def get_new_command(command):
+    return replace_argument(command.script, 'commit', 'commit -a')