git/git-compat-util.h, branch v2.4.2

Merge branch 'km/bsd-sysctl'

2015-03-20T20:11:49Z

We now detect number of CPUs on older BSD-derived systems. * km/bsd-sysctl: thread-utils.c: detect CPU count on older BSD-like systems configure: support HAVE_BSD_SYSCTL option

Merge branch 'km/bsd-shells'

2015-03-20T20:11:48Z

Portability fixes and workarounds for shell scripts have been added to help BSD-derived systems. * km/bsd-shells: t5528: do not fail with FreeBSD shell help.c: use SHELL_PATH instead of hard-coded "/bin/sh" git-compat-util.h: move SHELL_PATH default into header git-instaweb: use @SHELL_PATH@ instead of /bin/sh git-instaweb: allow running in a working tree subdirectory

configure: support HAVE_BSD_SYSCTL option

2015-03-10T22:13:25Z

On BSD-compatible systems some information such as the number of available CPUs may only be available via the sysctl function. Add support for a HAVE_BSD_SYSCTL option complete with autoconf support and include the sys/syctl.h header when the option is enabled to make the sysctl function available. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano

git-compat-util.h: move SHELL_PATH default into header

2015-03-10T22:11:24Z

If SHELL_PATH is not defined we use "/bin/sh". However, run-command.c is not the only file that needs to use the default value so move it into a common header. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano

Merge branch 'bw/kwset-use-unsigned'

2015-03-06T23:02:33Z

The borrowed code in kwset API did not follow our usual convention to use "unsigned char" to store values that range from 0-255. * bw/kwset-use-unsigned: kwset: use unsigned char to store values with high-bit set

Merge branch 'rj/no-xopen-source-for-cygwin' into maint

2015-03-06T22:57:58Z

Code cleanups. * rj/no-xopen-source-for-cygwin: git-compat-util.h: remove redundant code

Merge branch 'es/squelch-openssl-warnings-on-macosx' into maint

2015-03-05T21:13:07Z

An earlier workaround to squelch unhelpful deprecation warnings from the complier on Mac OSX unnecessarily set minimum required version of the OS, which the user might want to raise (or lower) for other reasons. * es/squelch-openssl-warnings-on-macosx: git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED

Merge branch 'rj/no-xopen-source-for-cygwin'

2015-03-05T20:45:41Z

Code cleanups. * rj/no-xopen-source-for-cygwin: git-compat-util.h: remove redundant code

kwset: use unsigned char to store values with high-bit set

2015-03-02T20:32:24Z

Sun Studio on Solaris issues warnings about improper initialization values being used when defining tolower_trans_tbl[] in ctype.c. The array wants to store values with high-bit set and treat them as values between 128 to 255. Unlike the rest of the Git codebase where we explicitly specify 'unsigned char' for such variables and arrays, however, kwset code we borrowed from elsewhere uses 'char' for this and other variables. Fix the declarations to explicitly use 'unsigned char' where necessary to bring it in line with the rest of the Git. Signed-off-by: Ben Walton Signed-off-by: Junio C Hamano

Merge branch 'jk/blame-commit-label' into maint

2015-02-25T06:09:54Z

"git blame HEAD -- missing" failed to correctly say "HEAD" when it tried to say "No such path 'missing' in HEAD". * jk/blame-commit-label: blame.c: fix garbled error message use xstrdup_or_null to replace ternary conditionals builtin/commit.c: use xstrdup_or_null instead of envdup builtin/apply.c: use xstrdup_or_null instead of null_strdup git-compat-util: add xstrdup_or_null helper