Chris, Would you mind running dos2unix on the following three xsl files in koha master: [marcel@RKM004 testclone]$ grep -Ulr --include=*.xsl "^M" * koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl These three files are the only xsl files in dos format. I could generate a patch for it, but again this will result in lots of whitespace warnings. If you have another idea, please let me know. Marcel -----Oorspronkelijk bericht----- Van: koha-devel-bounces@lists.koha-community.org [mailto:koha-devel-bounces@lists.koha-community.org] Namens Marcel de Rooy Verzonden: maandag 10 oktober 2011 10:20 Aan: koha-devel@lists.koha-community.org Onderwerp: Re: [Koha-devel] Git whitespace warnings on DOS files Thanks for replying, Colin. Applying with --whitespace=strip (or fix) does not make a difference. In both cases the errors are shown, but the changes are applied. I would just like to get rid of the warnings, because they are not valid in this case. In a DOS file (such as this file still is), all lines have CR before LF. When a patch generates warnings, it is likely to be ignored. Apparently, the git developers did not yet tackle this line endings issue. -----Oorspronkelijk bericht----- Van: koha-devel-bounces@lists.koha-community.org [mailto:koha-devel-bounces@lists.koha-community.org] Namens Colin Campbell Verzonden: donderdag 6 oktober 2011 15:06 Aan: koha-devel@lists.koha-community.org Onderwerp: Re: [Koha-devel] Git whitespace warnings on DOS files On 06/10/11 12:29, Marcel de Rooy wrote:
Hi all,
Does anyone of you know how to get rid of whitespace warnings in git in the following scenario. (See also bugzilla patch 6803). (Note that I am using git version 1.6.0.6.) If you have a higher version and do not have the warnings, please let me know.
I think if you set git config apply.whitespace=strip it will show the error but strip the whitespace errors in applying the patch. C. -- Colin Campbell Chief Software Engineer, PTFS Europe Limited Content Management and Library Solutions +44 (0) 845 557 5634 (phone) +44 (0) 7759 633626 (mobile) colin.campbell@ptfs-europe.com skype: colin_campbell2 http://www.ptfs-europe.com _______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/ _______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/