dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-23 13:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: Handle empty commit history in cmd_diff

Browse source
This commit is contained in:
Paul Gauthier 2024-08-10 09:11:16 -07:00 • committed by Paul Gauthier (aider)
parent 9d0b3d17bc
commit 8769f31640
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aider/commands.py
View file

@ -477,8 +477,8 @@ class Commands:
return return
if len(self.coder.commit_before_message) < 2: if len(self.coder.commit_before_message) < 2:
return commit_before_message = current_head + "^"
else:
commit_before_message = self.coder.commit_before_message[-2] commit_before_message = self.coder.commit_before_message[-2]
if not commit_before_message or commit_before_message == current_head: if not commit_before_message or commit_before_message == current_head:

2
aider/repo.py
View file

@ -227,6 +227,8 @@ class GitRepo:
args = [] args = []
if pretty: if pretty:
args += ["--color"] args += ["--color"]
else:
args += ["--color=never"]
args += [from_commit, to_commit] args += [from_commit, to_commit]
diffs = self.repo.git.diff(*args) diffs = self.repo.git.diff(*args)

2
tests/basic/test_commands.py
View file

@ -818,7 +818,7 @@ class TestCommands(TestCase):
# Mock repo.get_commit_message to return a canned commit message # Mock repo.get_commit_message to return a canned commit message
with mock.patch.object( with mock.patch.object(
repo, "get_commit_message", return_value="Canned commit message" coder.repo, "get_commit_message", return_value="Canned commit message"
): ):
# Run cmd_commit # Run cmd_commit
commands.cmd_commit() commands.cmd_commit()