user/sven/git.git, branch v1.7.7.4

Git 1.7.7.4

2011-11-18T19:28:05Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-name-rev-all' into maint

2011-11-18T19:14:16Z

* jc/maint-name-rev-all: name-rev --all: do not even attempt to describe non-commit object

Merge branch 'ml/mailmap' into maint

2011-11-18T19:14:00Z

* ml/mailmap: mailmap: xcalloc mailmap_info Conflicts: mailmap.c

Merge branch 'jn/maint-notes-avoid-va-args' into maint

2011-11-18T19:11:50Z

* jn/maint-notes-avoid-va-args: notes merge: eliminate OUTPUT macro Conflicts: notes-merge.c

Makefile: add missing header file dependencies

2011-11-18T18:45:33Z

When the streaming filter API was introduced in v1.7.7-rc0~60^2~7 (2011-05-20), we forgot to add its header to LIB_H. Most translation units depend on streaming.h via cache.h. v1.7.5-rc0~48 (Fix sparse warnings, 2011-03-22) introduced undeclared dependencies by url.o on url.h and thread-utils.o on thread-utils.h. Noticed by make CHECK_HEADER_DEPENDENCIES=1. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

notes merge: eliminate OUTPUT macro

2011-11-18T07:35:22Z

The macro is variadic, which breaks support for pre-C99 compilers, and it hides an "if", which can make code hard to understand on first reading if some arguments have side-effects. The OUTPUT macro seems to have been inspired by the "output" function from merge-recursive. But that function in merge-recursive exists to indent output based on the level of recursion and there is no similar justification for such a function in "notes merge". Noticed with 'make CC="gcc -std=c89 -pedantic"': notes-merge.c:24:22: warning: anonymous variadic macros were introduced in C99 [-Wvariadic-macros] Encouraged-by: Nguyễn Thái Ngọc Duy Signed-off-by: Jonathan Nieder Acked-by: Johan Herland Signed-off-by: Junio C Hamano

mailmap: xcalloc mailmap_info

2011-11-17T02:00:56Z

This is to avoid reaching free of uninitialized members. With an invalid .mailmap (and perhaps in other cases), it can reach free(mi->name) with garbage for example. Signed-off-by: Marc-André Lureau Signed-off-by: Junio C Hamano

name-rev --all: do not even attempt to describe non-commit object

2011-11-15T23:51:05Z

This even dates back to the very beginning of "git name-rev"; it does not make much sense to dump all objects in the repository and label non-commits as "undefined". Signed-off-by: Junio C Hamano

Git 1.7.7.3

2011-11-09T00:37:00Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-remove-renamed-ref' into maint

2011-11-09T00:35:53Z

* jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c