undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Makefile: Add TAGS and tags targets
  ls-files: Don't require exclude files to end with a newline.
This commit is contained in:
Junio C Hamano 2006-03-18 14:58:20 -08:00
commit b7986ce884
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -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

3
ls-files.c
View File

@ -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') {