From 589e7eefea8fdaafa61b0256c2544dbbd6fa5f75 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Tue, 8 Aug 2023 08:48:48 -0300 Subject: [PATCH] We always want diffs of working-dir + index versus repo #184 --- aider/repo.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/aider/repo.py b/aider/repo.py index 16bcc45e4..28b3c700d 100644 --- a/aider/repo.py +++ b/aider/repo.py @@ -126,19 +126,11 @@ class GitRepo: return commit_message def get_diffs(self, pretty, *args): - try: - commits = self.repo.iter_commits(self.repo.active_branch) - current_branch_has_commits = any(commits) - except git.exc.GitCommandError: - current_branch_has_commits = False - - if not current_branch_has_commits: - return "" + # we always want diffs of working-dir + index versus repo + args = ["--cached"] + list(args) if pretty: args = ["--color"] + list(args) - if not args: - args = ["HEAD"] diffs = self.repo.git.diff(*args) return diffs