Re: What's cooking in git.git (Jan 2011, #01; Tue, 4)

From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Jan 8, 2011, 18:40 UTC
Message-ID: <4D28AF82.4040102@ramsay1.demon.co.uk>
In-Reply-To: <7vipy4dy8y.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 9 quoted lines

> 
> * rj/test-fixes (2010-12-14) 4 commits
>  - t4135-*.sh: Skip the "backslash" tests on cygwin
>  - t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
>  - t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
>  - t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
> 
> I don't think people on different vintage of Cygwin agreed they are good
> workarounds---please correct me if I am mistaken.

No, it was different vintages of MinGW not Cygwin. Well, to be more precise, it is the different versions of sed that are installed in MinGW by the msysGit installer. ;-)

I used msysGit-fullinstall-1.6.4-preview20090729.exe to install msysGit, 18 months ago, and my version of sed is quite old. However, these patches (which were done mainly for the benefit of cygwin) were written assuming the more recent sed version installed by a more recent msysGit installer. (judging by commit ca02ad34.) In other words, the sed version on cygwin is new enough to know about the -b (--binary) option and so is the more recent msysGit installers (but I don't know exactly which version).

I can use my patch #14, which you didn't pick up, to run the above tests on my old installation. (Johannes was the only other laggard identified and he claims to be upgrading soon! :-D Yeah, I should too.)

So, unless Johannes can think of something I've missed, I think all of these commits are good to go...

ATB, Ramsay Jones