git, branch v1.6.4-rc2

configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing

2009-07-23T04:57:41Z

The empty assignment NEEDS_SSL_WITH_CRYPTO= was mistakenly paired with the assignment NEEDS_SSL_WITH_CRYPTO=YesPlease in the "action-if-found" parameter of the AC_CHECK_LIB macro. The empty assignment was intended for the "action-if-not-found" section, since in that case, the necessary sha1 hash function was not found and the internal sha1 implementation will be used instead. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

janitor: useless checks before free

2009-07-23T04:57:41Z

Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

janitor: add DIV_ROUND_UP and use it.

2009-07-23T04:57:41Z

Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

refactor: use bitsizeof() instead of 8 * sizeof()

2009-07-23T04:57:41Z

Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

janitor: use NULL and not 0 for pointers.

2009-07-23T04:57:41Z

Brought to you thanks to coccinelle: ---8<---- @@ expression *E; @@ ( E == - 0 + NULL | E != - 0 + NULL | E = - 0 + NULL ) @@ identifier f; type T; @@ T *f(...) { <... - return 0; + return NULL; ...> } --->8---- There are a lot more hits in compat/nedmallox and compat/regex but these are borrowed code we rather do not want to maintain our own forks for, and this patch refrains from touching them. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

git stash: modernize use of "dashed" git-XXX calls

2009-07-23T04:57:41Z

Replace remaining git-XXX calls with git XXX. Signed-off-by: Martin Koegler Acked-by: Nanako Shiraishi Signed-off-by: Junio C Hamano

Improve doc for format-patch threading options.

2009-07-23T04:57:41Z

This hopefully makes the relationship between threading options of format-patch and send-email easier to grasp. Signed-off-by: Yann Dirson Signed-off-by: Junio C Hamano

List send-email config options in config.txt.

2009-07-23T04:57:41Z

Also mention deprecated aliases that do not appear in the send-email manpage. Signed-off-by: Yann Dirson Signed-off-by: Junio C Hamano

configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests

2009-07-23T04:56:51Z

The "action" parameters for these two tests were supplied incorrectly for the way the tests were implemented. The tests check whether a program which calls hstrerror() or basename() successfully links when -lresolv or -lgen are used, respectively. A successful linking would result in NEEDS_RESOLV or NEEDS_LIBGEN being unset, and failure would result in setting the respective variable. Aside from that issue, the tests did not handle the case where neither library was necessary for accessing the functions in question. So solve both of these issues by re-working the two tests so that their form is like the NEEDS_SOCKET test which attempts to link with just the c library, and if it fails then assumes that the additional library is necessary and sets the appropriate variable. Also an entry in the config.mak.in file is necessary for the NEEDS_LIBGEN variable to appear in the config.mak.autogen file with the value assigned by the configure script. Without it, the generated shell script would contain a snippet like this: for ac_lib in ; do ... which is incorrect. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-07-23T04:56:46Z

* maint: Trailing whitespace and no newline fix diff --cc: a lost line at the beginning of the file is shown incorrectly combine-diff.c: fix performance problem when folding common deleted lines