From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 18 Mar 2006 10:27:45 +0000 (+0100)
Subject: ls-files: Don't require exclude files to end with a newline.
X-Git-Tag: v1.3.0-rc1~19^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=451d7b47f1ba380b4f8e32b28052fff06eeb8638;p=git.git

ls-files: Don't require exclude files to end with a newline.

Without this patch, the last line of an exclude file is silently
ignored if it doesn't end with a newline.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/ls-files.c b/ls-files.c
index df25c8c01..e42119c5e 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -92,11 +92,12 @@ static int add_excludes_from_file_1(const char *fname,
 		close(fd);
 		return 0;
 	}
-	buf = xmalloc(size);
+	buf = xmalloc(size+1);
 	if (read(fd, buf, size) != size)
 		goto err;
 	close(fd);
 
+	buf[size++] = '\n';
 	entry = buf;
 	for (i = 0; i < size; i++) {
 		if (buf[i] == '\n') {