[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: |
Jim Meyering |
Subject: |
Re: [Bug-vc-dwim] vc-dwim 1.5: external diff died |
Date: |
Mon, 03 Oct 2011 13:23:39 +0200 |
Bruno Haible wrote:
> Hi Jim,
>
> I'm trying to use vc-dwim 1.5, but I'm getting an error message that I cannot
> interpret.
>
> I have 4 modified files:
>
> # modified: ChangeLog
> # modified: doc/posix-functions/utimensat.texi
> # modified: lib/relocatable.c
> # modified: lib/utimensat.c
>
> and the ChangeLog modification is this one:
>
> $ (unset GIT_EXTERNAL_DIFF ; git diff ChangeLog)
> diff --git a/ChangeLog b/ChangeLog
> index a6d363a..1355eb9 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,13 @@
> +2011-10-03 Bruno Haible <address@hidden>
> +
> + relocatable-lib[-lgpl]: Avoid expensive /proc access on Linux, Cygwin.
> + * lib/relocatable.c (ENABLE_COSTLY_RELOCATABLE): New macro.
> + (compute_curr_prefix, shared_library_fullname,
> + find_shared_library_fullname, get_shared_library_fullname, relocate):
> + Use it together with PIC && INSTALLDIR.
> + Reported by <address@hidden>
> + via Charles Wilson <address@hidden>.
> +
> 2011-10-01 Jim Meyering <address@hidden>
>
> maint.mk: adjust a release-related rule not to require use of gzip
>
>
> $ (unset GIT_EXTERNAL_DIFF ; vc-dwim)
> external diff died, stopping at ChangeLog.
> vc-dwim: error closing pipe from `git diff -B -C HEAD -- ChangeLog':
> terminated with exit status 1
Hi Bruno,
Perhaps GIT_EXTERNAL_DIFF is still set in the environment?
Does it still fail if you invoke it like this?
env -u GIT_EXTERNAL_DIFF vc-dwim