dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-31 01:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: Handle git diff prefixes in udiff file paths correctly

Browse source
This commit is contained in:
Paul Gauthier (aider) 2025-04-14 21:27:06 -07:00
parent 8b5fc801da
commit 758979e4f3
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
aider/coders/udiff_coder.py
View file

@ -344,11 +344,16 @@ def process_fenced_block(lines, start_line_num):
if block[0].startswith("--- ") and block[1].startswith("+++ "):
# Extract the file path, considering that it might contain spaces
a_fname = block[1][4:].strip()
a_fname = block[0][4:].strip()
b_fname = block[1][4:].strip()
# if a_fname starts with a/ and b_fname starts with b/, strip b/ ai!
fname = b_fname
# Check if standard git diff prefixes are present and strip them
if a_fname.startswith("a/") and b_fname.startswith("b/"):
fname = b_fname[2:]
else:
# Otherwise, assume the path is as intended
fname = b_fname
block = block[2:]
else:
fname = None