sssh

aider/coders/base_coder.py

@@ -381,8 +381,7 @@ class Coder:
             self.commands,
         )
 
-        if self.should_dirty_commit(inp):
-            self.dirty_commit()
+        if self.should_dirty_commit(inp) and self.dirty_commit():
             if inp.strip():
                 self.io.tool_output("Use up-arrow to retry previous command:", inp)
             return
@@ -424,6 +423,7 @@ class Coder:
 
         # files changed, move cur messages back behind the files messages
         self.move_back_cur_messages(self.gpt_prompts.files_content_local_edits)
+        return True
 
     def fmt_system_reminder(self):
         prompt = self.gpt_prompts.system_reminder

aider/repo.py

@@ -61,7 +61,6 @@ class AiderRepo:
             commit_message = message
         else:
             diffs = self.get_diffs(False)
-            dump(diffs)
             commit_message = self.get_commit_message(diffs, context)
 
         if not commit_message:
@@ -100,8 +99,6 @@ class AiderRepo:
             content += context + "\n"
         content += diffs
 
-        dump(content)
-
         messages = [
             dict(role="system", content=prompts.commit_system),
             dict(role="user", content=content),
@@ -146,8 +143,6 @@ class AiderRepo:
         except git.exc.GitCommandError:
             current_branch_has_commits = False
 
-        dump(current_branch_has_commits)
-
         if not current_branch_has_commits:
             return ""