diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-19 01:58:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-19 01:58:20 +0300 |
| commit | b7986ce884a6c23e3776658904879df1d6193668 (patch) | |
| tree | 51048af74b5c680b308d1bd98e85a3abebe6463b /ls-files.c | |
| parent | 2fc27528f6d3f8c90d9ea38c8c70c83fbfe523d7 (diff) | |
| parent | f81e7c626f34658289594386b0273755f47912a2 (diff) | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ls-files.c b/ls-files.c index 585f6a7ff2..3a17e5d8e0 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') { |