From: Steffen Prohaska <prohaska@zib.de>
Date: Wed, 15 Aug 2007 05:22:50 GMT
Subject: Re: git on Cygwin: Not a valid object name HEAD
Message-ID: <30FE2B1C-B651-4F1D-B5D9-CD3C3261F531@zib.de>
In-Reply-To: <e7bda7770708141704m587dfdbdqfbab51b8ac6fcff@mail.gmail.com>


On Aug 15, 2007, at 2:04 AM, Torgil Svensson wrote:

> On 8/11/07, Steffen Prohaska <prohaska@zib.de> wrote:
>
>>>>  [..list of tools and links]
>>>
>>> Thank you for the information!  i'll check those up.
>>
>>
>> I hope to have an improved list on monday, sorted by priority of
>> the developers I'm working with.
>>
>> I thought I do some coding, to find out a bit more about the
>> stability of msysgit. So I started and added support for kdiff3
>> on Windows (see patches in separate mail).
>
> neat.The hardest part for me was to find out that I didn't have to
> configure anything or add a command line option to get kdiff3 running.
> (I cheated looking in the source, I think we should add #ifdef
> __MINGW32__ / #endif around the registry reading part.

What does __MINGW32__ mean for shell code? The registry reading
should just be ignored if registry access 'reg.exe' is not available.

However, the code was not yet robust. I pushed the patch below to
4msysgit.git's mob.

	Steffen


commit 816f61fecd9e90879afcbad9234f19bf6d982b76
Author: Johannes Schmidt-Ehrenberg <schmidt-ehrenberg@zib.de>
Date:   Mon Aug 13 19:00:39 2007 +0200

     mergetool: fixed parsing of registry entry for kdiff3

     The old code failed on Windows Vista. The output of
     reg.exe or something else may be a bit different.
     This patch improves the parsing code to be more robust.

     Signed-off-by: Steffen Prohaska <prohaska@zib.de>