diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-18 14:58:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-18 14:58:20 -0800 |
| commit | b7986ce884a6c23e3776658904879df1d6193668 (patch) | |
| tree | 51048af74b5c680b308d1bd98e85a3abebe6463b | |
| parent | 2fc27528f6d3f8c90d9ea38c8c70c83fbfe523d7 (diff) | |
| parent | f81e7c626f34658289594386b0273755f47912a2 (diff) | |
| download | git-b7986ce884a6c23e3776658904879df1d6193668.tar.gz | |
Merge branch 'master' into next
* master:
Makefile: Add TAGS and tags targets
ls-files: Don't require exclude files to end with a newline.
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | ls-files.c | 3 |
2 files changed, 11 insertions, 3 deletions
@@ -553,6 +553,13 @@ $(LIB_FILE): $(LIB_OBJS) doc: $(MAKE) -C Documentation all +TAGS: + rm -f TAGS + find . -name '*.[hcS]' -print | xargs etags -a + +tags: + rm -f tags + find . -name '*.[hcS]' -print | xargs ctags -a ### Testing rules @@ -617,7 +624,7 @@ rpm: dist clean: rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE) rm -f $(ALL_PROGRAMS) git$X - rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h + rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags rm -rf $(GIT_TARNAME) rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz $(MAKE) -C Documentation/ clean @@ -626,5 +633,5 @@ clean: rm -f GIT-VERSION-FILE .PHONY: all install clean strip -.PHONY: .FORCE-GIT-VERSION-FILE +.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags 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') { |