Description

ceccopierangiolieugenio

opened on Mar 12, 2025

Issue body actions

the regex:

GitPython/git/diff.py

Line 372 in 6d09bb6

[ ](?P<a_path_fallback>"?[ab]/.+?"?)[ ](?P<b_path_fallback>"?[ab]/.+?"?)\n

is not able to match the diff generated if this flag is enabled in ~/.gitconfig:

[diff]
        mnemonicPrefix = true

because it is expecting [ab]/ as folder prefix for the diff but with mnemonicPrefix enabled it become [wc]/

Diff without mnemonicPrefix

diff --git a/.vscode/launch.json b/.vscode/launch.json
index xxxxxxx..xxxxxxxx
--- a/.vscode/launch.json
+++ b/.vscode/launch.json

Diff with mnemonicPrefix = true

diff --git c/.vscode/launch.json w/.vscode/launch.json
index xxxxxxx..xxxxxxxx
--- c/.vscode/launch.json
+++ w/.vscode/launch.json

Quick Test

repo = git.Repo('.')
branch_ref = repo.head
ancestor_ref = repo.merge_base(branch_ref, repo.refs["main"])
diff = ancestor_ref[0].diff(None, create_patch=True)
print(diff)

Activity

1. Byron

   added

   acknowledged

   help wanted

   on Mar 12, 2025
2. Byron commented on Mar 12, 2025

   

   Byron

   on Mar 12, 2025

   Member

   More actions

   Thanks a lot for reporting!

   To fix this, GitPython should control for this flag and turn it off when invoking Git, i.e. with git -c mnemonicPrefix=false.

   Reacted by Pier CeccoPierangioliEugenio
3. ceccopierangiolieugenio commented on Mar 13, 2025

   

   ceccopierangiolieugenio

   on Mar 13, 2025

   Author

   More actions

   thanks @Byron, is it there a workaround I can use in the meantime?
   something like:

   diff = ancestor_ref[0].diff(None, create_patch=True, c='diff.mnemonicPrefix=false')
4. ceccopierangiolieugenio commented on Mar 13, 2025

   

   ceccopierangiolieugenio

   on Mar 13, 2025

   Author

   More actions

   So far a quick workaround is:

   diff = ancestor_ref[0].diff(None, create_patch=True, **{'src-prefix':'a/','dst-prefix':'b/'})
5. Byron

   added the

   Bug

   issue type on Jul 20, 2026
6. Byron

   closed this as completedin #2191on Jul 26, 2026

Issue actions