[Koha-devel] FW: Git whitespace warnings on DOS files

Chris Cormack chris at bigballofwax.co.nz
Mon Oct 10 11:13:43 CEST 2011


On 10 October 2011 21:29, Marcel de Rooy <M.de.Rooy at rijksmuseum.nl> wrote:
> Chris,
> Would you mind running dos2unix on the following three xsl files in koha master:
>
> [marcel at 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.

Interestingly I get a different result

chrisc at rorohiko:~/git/koha$ grep -Ulr --include=*.xsl "^M" *
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl

(perhaps you didnt do a ctrl-v ctrl-m to create the ^M)

I have fixed the line endings on those ones

Chris


More information about the Koha-devel mailing list