remove CR/LF from .gitignore

remove CR/LF from .gitignore

[Alex Riesen]

[-- Attachment #1: Type: text/plain, Size: 397 bytes --]

For everyone cursed by dos/windows line endings (aka CRLF):

The code reading the .gitignore files (excludes and excludes per
directory) leaves \r in the patterns, which causes fnmatch to fail for
no obvious reason. Just remove a "\r" preceding a "\n"
unconditionally.

---

Junio, sorry for attachments. Have no other way to it on gmail here at
work. The other patch is just the test.

[-- Attachment #2: msdos-excludes.patch --]
[-- Type: application/xxxxx, Size: 401 bytes --]

[-- Attachment #3: msdos-excludes-test.patch --]
[-- Type: application/xxxxx, Size: 648 bytes --]

Re: remove CR/LF from .gitignore

[Linus Torvalds]

On Wed, 2 Nov 2005, Alex Riesen wrote:
>
> For everyone cursed by dos/windows line endings (aka CRLF):

Btw, it would be good if somebody verified that the .git/config file also 
works with CR/LF. 

I'm pretty sure "\" at the end of line will break, but I didn't care 
enough. And maybe nobody does. Normal config files _should_ work, but 
you can guess how eager I'm to test it ;)

		Linus

Re: remove CR/LF from .gitignore

[Junio C Hamano]

Linus Torvalds <torvalds@osdl.org> writes:

> On Wed, 2 Nov 2005, Alex Riesen wrote:
>>
>> For everyone cursed by dos/windows line endings (aka CRLF):
>
> Btw, it would be good if somebody verified that the .git/config file also 
> works with CR/LF. 
>
> I'm pretty sure "\" at the end of line will break, but I didn't care 
> enough. And maybe nobody does. Normal config files _should_ work, but 
> you can guess how eager I'm to test it ;)

Something like this?

---
cd /opt/packrat/playpen/public/in-place/git/git.junio/
git diff
diff --git a/config.c b/config.c
index 519fecf..e89bab2 100644
--- a/config.c
+++ b/config.c
@@ -13,6 +13,14 @@ static int get_next_char(void)
 	c = '\n';
 	if ((f = config_file) != NULL) {
 		c = fgetc(f);
+		if (c == '\r') {
+			/* DOS like systems */
+			c = fgetc(f);
+			if (c != '\n') {
+				ungetc(c, f);
+				c = '\r';
+			}
+		}
 		if (c == '\n')
 			config_linenr++;
 		if (c == EOF) {

Compilation finished at Wed Nov  2 12:24:27