GNOME Bugzilla – Bug 691444
Meld 1.6.1 issue with Git 1.8.1
Last modified: 2013-01-11 19:39:16 UTC
Created attachment 233102 [details] Sample git repository where I had the issue Issue: Invoking 'patch' failed. Maybe you don't have 'GNU patch' installed, or you use an untested version of Git. Please send email bug report to: meld-list@gnome.org Containing the following information: - meld version: '1.6.1' - source control software type: 'Git' - source control software version: 'X.Y.Z' - the output of 'git diff --relative HEAD somefile.txt' - patch command: 'patch -p1 -R -d /tmp/tmp3XPGdT-meld' (no need to actually run it, just provide the command line) Replace 'X.Y.Z' by the actual version for the source control software you use. Repro steps: 1) Launch Meld 2) [File]>[New] 3) [File Control Browser] 4) [Browse...]>{select git_test directory}>[Open] 5) [Ok] (At this point the directory diff tab is shown, and README is highlighted as modified) 6) Double click on README (The above error is shown) System info: $ meld --version meld 1.6.1 $ git --version git version 1.8.1 $ uname -a Linux polson 3.6.11-1-ARCH #1 SMP PREEMPT Tue Dec 18 08:57:15 CET 2012 x86_64 GNU/Linux $ pacman -Qs meld local/meld 1.6.1-1 Visual diff and merge tool $ git diff --relative HEAD README diff --git a/README b/README index fd73bfb..9555cf3 100644 --- a/README +++ b/README @@ -1 +1,2 @@ Text inserted on 2nd commit +Text inserted before 3rd commit
So even from the repo you've provided, I can't reproduce the bug with either my current version of Git, or 1.8.1. At this point, I suspect that there's some configuration flag you have set that's changing the diff output we're getting. If it's possible, could you post your config and/or any other relevant info? I'm thinking colour settings or an external diff program could be involved, but I'm really not sure.
Ah, good catch. Apparently I had played with the color section at sometime and not reverted my changes back. Relevant portion of .gitconfig [color] diff = always grep = always interactive = always status = always pager = true branch = always ui = auto Removing "diff = always" above makes meld work fine. (I'm cleaning out all of that to just "ui = auto" for the future)
Ah, okay. Yeah that's one of the cases that the new VC code is designed to circumvent. Fixing that in the stable release series would be too risky I think, so since this works in current HEAD, I'm just going to let this one go. Thanks anyway for the bug report and the followup.