Commit d3530fa9 authored by Committed by Kai Willadsen
Fix git file comparison with mnemonic prefixes (closes bgo#663050)
If the git config setting diff.mnemonicprefix is set, that causes git diff to use prefixes that indicate what is being compared rather than always using "a" and "b". For the way that meld invokes git diff, the prefixes will always be "c" for commit (HEAD) and and "w" for the work tree. This confuses the patch parser and prevents the modified files from being copied to the temporary directory, which then results in patch failing to reverse the changes. This patch fixes this by modifying the regular expression used to find index entries in the patch to accept "c" and "w" as prefixes as well as "a" and "b".
Showing with 1 addition and 1 deletion