diff --git a/tests/test_main.py b/tests/test_main.py
index a497c1d74..2dbe47b8f 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -32,3 +32,15 @@ class TestMain(TestCase):
             main(["--yes", "foo.txt"], input=pipe_input, output=DummyOutput())
             pipe_input.close()
             self.assertTrue(os.path.exists("foo.txt"))
+
+    def test_main_no_auto_commits(self):
+        with unittest.mock.patch("aider.main.Coder") as MockCoder:
+            with tempfile.TemporaryDirectory() as temp_dir:
+                os.chdir(temp_dir)
+                subprocess.run(["git", "init"], cwd=temp_dir)
+                pipe_input = create_input(StringIO(""))
+                main(["--no-auto-commits"], input=pipe_input, output=DummyOutput())
+                pipe_input.close()
+
+            mock_coder_instance = MockCoder.return_value
+            self.assertFalse(mock_coder_instance.auto_commits)