• Aaron Schrab's avatar
    Fix git file comparison with mnemonic prefixes (closes bgo#663050) · d3530fa9
    Aaron Schrab authored
    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".
    d3530fa9
Name
Last commit
Last update
bin Loading commit data...
data Loading commit data...
help Loading commit data...
meld Loading commit data...
po Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
AUTHORS Loading commit data...
COPYING Loading commit data...
INSTALL Loading commit data...
Makefile Loading commit data...
NEWS Loading commit data...
meld.1 Loading commit data...
meld.doap Loading commit data...