Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Graeme Geldenhuys
On 06/10/2011 20:41, Reinier Olislagers wrote: rem check setting - yes, input: git config --global core.autocrlf input The Git installation under Windows set mine to true (not input). So while it could be used, I'd have to remember to run unix2dos over it - that is, if people expect a

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Reinier Olislagers
On 7-10-2011 9:15, Graeme Geldenhuys wrote: On 06/10/2011 20:41, Reinier Olislagers wrote: The Git installation under Windows set mine to true (not input). true it is, see other message ;) So while it could be used, I'd have to remember to run unix2dos over it - that is, if people expect a

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Marco van de Voort
In our previous episode, Graeme Geldenhuys said: So while it could be used, I'd have to remember to run unix2dos over it - that is, if people expect a Windows patch ( I don't think that is needed. I believe the 'patch' program will sort that out by itself. I have sent numerous patches to

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Reinier Olislagers
On 7-10-2011 9:15, Graeme Geldenhuys wrote: I don't think that is needed. I believe the 'patch' program will sort that out by itself. I have sent numerous patches to FPC and Lazarus (both those repositories are git ones on my Linux system). Nobody has ever complained that the EOL style was

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Graeme Geldenhuys
On 07/10/2011 11:28, Marco van de Voort wrote: Even up to date patch doesn't always process lineendings properly btw. I have to dos2unix often on *nix too. Interesting. I would think sharing code between platform with patches is a bog-standard task these days, and all tools in question should

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Graeme Geldenhuys
On 07/10/2011 12:52, Reinier Olislagers wrote: doesn't work - will need patch -p1 git.diff Correct, and anybody that has applied a handful of patches or more in there time would have known that already. ;-) Regards, - Graeme - -- fpGUI Toolkit - a cross-platform GUI toolkit using Free

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Reinier Olislagers
On 7-10-2011 15:13, Graeme Geldenhuys wrote: On 07/10/2011 12:52, Reinier Olislagers wrote: doesn't work - will need patch -p1 git.diff Correct, and anybody that has applied a handful of patches or more in there time would have known that already. ;-) Sure, but why add to the aggravation -

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Graeme Geldenhuys
On 07/10/2011 15:53, Reinier Olislagers wrote: Sure, but why add to the aggravation - SVN diff doesn't do this, so one less difference to worry about: It's still in the universal patch format, with or without the path prefixes. Also nobody should commit a patch blindly. They should review the

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Florian Klämpfl
Am 07.10.2011 11:28, schrieb Marco van de Voort: In our previous episode, Graeme Geldenhuys said: So while it could be used, I'd have to remember to run unix2dos over it - that is, if people expect a Windows patch ( I don't think that is needed. I believe the 'patch' program will sort that

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Florian Klämpfl
Am 07.10.2011 16:08, schrieb Graeme Geldenhuys: On 07/10/2011 15:53, Reinier Olislagers wrote: Sure, but why add to the aggravation - SVN diff doesn't do this, so one less difference to worry about: It's still in the universal patch format, with or without the path prefixes. Also nobody

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Marco van de Voort
In our previous episode, Graeme Geldenhuys said: Even up to date patch doesn't always process lineendings properly btw. I have to dos2unix often on *nix too. Interesting. I would think sharing code between platform with patches is a bog-standard task these days, and all tools in question

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-07 Thread Sven Barth
On 07.10.2011 20:44, Florian Klämpfl wrote: Am 07.10.2011 11:28, schrieb Marco van de Voort: In our previous episode, Graeme Geldenhuys said: So while it could be used, I'd have to remember to run unix2dos over it - that is, if people expect a Windows patch ( I don't think that is needed. I

[fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Reinier Olislagers
On 4-10-2011 14:41, Reinier Olislagers wrote: On 4-10-2011 13:14, Marco van de Voort wrote: In our previous episode, Reinier Olislagers said: Having some trouble creating patches that actually work. (On Windows) I've been using git to get FPC trunk and git diff --no-prefix

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Alex Shishkin
06.10.2011 16:37, Reinier Olislagers пишет: On 4-10-2011 14:41, Reinier Olislagers wrote: On 4-10-2011 13:14, Marco van de Voort wrote: In our previous episode, Reinier Olislagers said: Having some trouble creating patches that actually work. (On Windows) I've been using git to get FPC trunk

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Reinier Olislagers
On 6-10-2011 16:56, Alex Shishkin wrote: 06.10.2011 16:37, Reinier Olislagers пишет: On 4-10-2011 14:41, Reinier Olislagers wrote: On 4-10-2011 13:14, Marco van de Voort wrote: In our previous episode, Reinier Olislagers said: Having some trouble creating patches that actually work. (On

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Alex Shishkin
06.10.2011 18:59, Reinier Olislagers пишет: Thanks Alex, I already fiddled with that. I'll try again with core.autocrlf set to true and false to make sure it doesn't work... ___ fpc-pascal maillist - fpc-pascal@lists.freepascal.org

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Graeme Geldenhuys
On 06/10/2011, Reinier Olislagers wrote: Git: https://github.com/graemeg/freepascal/raw/7026b7669fd422f88ffe33174dac1725c0295427/packages/fcl-extra/src/win/ServiceManager.pas = Unix line endings via git pull etc = Unix line endings not surprising... Seems the SVN client is converting

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Graeme Geldenhuys
On 06/10/2011, Reinier Olislagers wrote: Thanks Alex, I already fiddled with that. I'll try again with core.autocrlf set to true and false to make sure it doesn't work... As far as I know, Git will only do the conversion when you clone a new repository, or when you pull new changes. If you

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Alex Shishkin
06.10.2011 19:15, Graeme Geldenhuys пишет: As far as I know, Git will only do the conversion when you clone a new repository, or when you pull new changes. If you had the setting wrong at the time you did the clone, the problem is on you. Simply change the setting, and get another clone (use

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Reinier Olislagers
On 6-10-2011 17:07, Graeme Geldenhuys wrote: On 06/10/2011, Reinier Olislagers wrote: Git: https://github.com/graemeg/freepascal/raw/7026b7669fd422f88ffe33174dac1725c0295427/packages/fcl-extra/src/win/ServiceManager.pas = Unix line endings via git pull etc = Unix line endings not

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Reinier Olislagers
On 6-10-2011 17:04, Alex Shishkin wrote: 06.10.2011 18:59, Reinier Olislagers пишет: Thanks Alex, I already fiddled with that. I'll try again with core.autocrlf set to true and false to make sure it doesn't work... not true not false, but input. Read this if have not yet :

Re: [fpc-pascal] Git line endings leading to patch problems - was [Semi-OT] Git format patches don't seem to work

2011-10-06 Thread Reinier Olislagers
On 6-10-2011 17:04, Alex Shishkin wrote: 06.10.2011 18:59, Reinier Olislagers пишет: Thanks Alex, I already fiddled with that. I'll try again with core.autocrlf set to true and false to make sure it doesn't work... not true not false, but input. Read this if have not yet :