[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-vc-dwim] vc-dwim 1.5: external diff died
From: |
Bruno Haible |
Subject: |
Re: [Bug-vc-dwim] vc-dwim 1.5: external diff died |
Date: |
Mon, 3 Oct 2011 20:39:26 +0200 |
User-agent: |
KMail/1.13.6 (Linux/2.6.37.6-0.5-desktop; KDE/4.6.0; x86_64; ; ) |
Hi Jim,
> I've pushed the change-sets included below.
> I think I've addressed your problem.
Very nice! Thank you. I confirm: "vc-dwim" can now parse the changes
to ChangeLog, and "vc-dwim --diff" produces output in the style of my
git diff driver.
> However, I have not tested
> whether setting GIT_EXTERNAL_DIFF to some script that actually
> does useful work does what you'd expect. Is there a canonical
> or minimal script that does that? Point me to one and I'll add
> a test to exercise it.
Find attached the one I'm using. Its output are context diffs (rather
than unified diff), and the file names don't have a/ and b/ prefixes,
but rather the first file name has a .orig suffix.
Bruno
my-diff-for-git
Description: application/shellscript