From 451d7b47f1ba380b4f8e32b28052fff06eeb8638 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 18 Mar 2006 11:27:45 +0100 Subject: [PATCH 1/2] 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 Signed-off-by: Junio C Hamano --- ls-files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ls-files.c b/ls-files.c index df25c8c012..e42119c5ee 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') { From f81e7c626f34658289594386b0273755f47912a2 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sat, 18 Mar 2006 11:07:12 +0100 Subject: [PATCH 2/2] Makefile: Add TAGS and tags targets Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8a20c76e9e..8d45378b68 100644 --- a/Makefile +++ b/Makefile @@ -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