summaryrefslogtreecommitdiff
path: root/ls-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-18 22:58:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-18 22:58:20 (GMT)
commitb7986ce884a6c23e3776658904879df1d6193668 (patch)
tree51048af74b5c680b308d1bd98e85a3abebe6463b /ls-files.c
parent2fc27528f6d3f8c90d9ea38c8c70c83fbfe523d7 (diff)
parentf81e7c626f34658289594386b0273755f47912a2 (diff)
downloadgit-b7986ce884a6c23e3776658904879df1d6193668.zip
git-b7986ce884a6c23e3776658904879df1d6193668.tar.gz
git-b7986ce884a6c23e3776658904879df1d6193668.tar.bz2
Merge branch 'master' into next
* master: Makefile: Add TAGS and tags targets ls-files: Don't require exclude files to end with a newline.
Diffstat (limited to 'ls-files.c')
-rw-r--r--ls-files.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ls-files.c b/ls-files.c
index 585f6a7..3a17e5d 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -93,11 +93,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') {