delta/git.git, branch fc/styles

block-sha1/sha1.c: have SP around arithmetic operators

2013-10-16T17:27:27+00:00

Signed-off-by: Junio C Hamano

base85.c: have SP around arithmetic operators

2013-10-16T17:27:26+00:00

Signed-off-by: Junio C Hamano

archive.c: have SP around arithmetic operators

2013-10-16T17:27:26+00:00

Signed-off-by: Junio C Hamano

alloc.c: have SP around arithmetic operators

2013-10-16T17:27:26+00:00

Signed-off-by: Junio C Hamano

abspath.c: have SP around arithmetic operators

2013-10-16T17:27:26+00:00

Signed-off-by: Junio C Hamano

alias: have SP around arithmetic operators

2013-10-16T17:27:26+00:00

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

C: have space around && and || operators

2013-10-16T17:26:39+00:00

Correct all hits from

    git grep -e '\(&&\|||\)[^ ]' -e '[^	 ]\(&&\|||\)' -- '*.c'

i.e. && or || operators that are followed by anything but a SP,
or that follow something other than a SP or a HT, so that these
operators have a SP around it when necessary.

We usually refrain from making this kind of a tree-wide change in
order to avoid unnecessary conflicts with other "real work" patches,
but in this case, the end result does not have a potentially
cumbersome tree-wide impact, while this is a tree-wide cleanup.

Fixes to compat/regex/regcomp.c and xdiff/xemit.c are to replace a
HT immediately after && with a SP.

This is based on Felipe's patch to bultin/symbolic-ref.c; I did all
the finding out what other files in the whole tree need to be fixed
and did the fix and also the log message while reviewing that single
liner, so any screw-ups in this version are mine.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

mergetool--lib: Fix typo in the merge/difftool help

2013-10-14T23:28:38+00:00

The help text for the `tool` flag should mention:

    --tool=

instead of:

    --tool-

Signed-off-by: Stefan Saasen 
Reviewed-by: David Aguilar 
Signed-off-by: Jonathan Nieder

sparse: suppress some "using sizeof on a function" warnings

2013-10-14T23:22:28+00:00

Sparse issues an "using sizeof on a function" warning for each
call to curl_easy_setopt() which sets an option that takes a
function pointer parameter. (currently 12 such warnings over 4
files.)

The warnings relate to the use of the "typecheck-gcc.h" header
file which adds a layer of type-checking macros to the curl
function invocations (for gcc >= 4.3 and !__cplusplus). As part
of the type-checking layer, 'sizeof' is applied to the function
parameter of curl_easy_setopt(). Note that, in the context of
sizeof, the function to function pointer conversion is not
performed and that sizeof(f) != sizeof(&f).

A simple solution, therefore, would be to replace the function
name in each such call to curl_easy_setopt() with an explicit
function pointer expression (i.e. replace f with &f).

However, the "typecheck-gcc.h" header file is only conditionally
included, in addition to the gcc and C++ checks mentioned above,
depending on the CURL_DISABLE_TYPECHECK preprocessor variable.

In order to suppress the warnings, we use target-specific variable
assignments to add -DCURL_DISABLE_TYPECHECK to SPARSE_FLAGS for
each file affected (http-push.c, http.c, http-walker.c and
remote-curl.c).

Signed-off-by: Ramsay Jones 
Signed-off-by: Jonathan Nieder

format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0

2013-10-14T23:20:01+00:00

The Thunderbird section of the 'MUA-specific hints' contains three
different approaches to setting up the mail client to leave patch
emails unmolested. The second approach (configuration) has a step
missing when configuring the composition window not to wrap. In
particular, the "mailnews.wraplength" configuration variable needs
to be set to zero. Update the documentation to add the missing
setting.

Signed-off-by: Ramsay Jones 
Signed-off-by: Jonathan Nieder