From 0213c4344a1d22b3784233b1acb08ffeba924e68 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 11 May 2023 17:02:37 -0700 Subject: [PATCH] Added a try-except block to handle GitCommandError and added a check to skip if current_branch_commit_count is None. --- aider/coder.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/aider/coder.py b/aider/coder.py index 84978c23e..1bafee299 100755 --- a/aider/coder.py +++ b/aider/coder.py @@ -464,17 +464,22 @@ class Coder: relative_dirty_files = [] for fname in file_list: relative_fname = os.path.relpath(fname, repo.working_tree_dir) + relative_dirty_files.append(relative_fname) + + try: + current_branch_commit_count = len(list(repo.iter_commits(repo.active_branch))) + except git.exc.GitCommandError: + current_branch_commit_count = None + + if not current_branch_commit_count: + continue + if self.pretty: - current_branch_commit_count = len(list(repo.iter_commits(repo.active_branch))) - if current_branch_commit_count > 0: - these_diffs = repo.git.diff("HEAD", "--color", "--", relative_fname) - else: - these_diffs = "" + these_diffs = repo.git.diff("HEAD", "--color", "--", relative_fname) else: these_diffs = repo.git.diff("HEAD", relative_fname) if these_diffs: - relative_dirty_files.append(relative_fname) diffs += these_diffs + "\n" return relative_dirty_files, diffs