git/config.c, branch v2.0.3

Merge branch 'bg/xcalloc-nmemb-then-size' into maint

2014-07-22T17:25:17Z

* bg/xcalloc-nmemb-then-size: transport-helper.c: rearrange xcalloc arguments remote.c: rearrange xcalloc arguments reflog-walk.c: rearrange xcalloc arguments pack-revindex.c: rearrange xcalloc arguments notes.c: rearrange xcalloc arguments imap-send.c: rearrange xcalloc arguments http-push.c: rearrange xcalloc arguments diff.c: rearrange xcalloc arguments config.c: rearrange xcalloc arguments commit.c: rearrange xcalloc arguments builtin/remote.c: rearrange xcalloc arguments builtin/ls-remote.c: rearrange xcalloc arguments

Merge branch 'ow/config-mailmap-pathname' into maint

2014-06-25T18:45:55Z

The "mailmap.file" configuration option did not support the tilde expansion (i.e. ~user/path and ~/path). * ow/config-mailmap-pathname: config: respect '~' and '~user' in mailmap.file

config.c: rearrange xcalloc arguments

2014-05-27T21:00:44Z

xcalloc() takes two arguments: the number of elements and their size. config.c includes several calls to xcalloc() that pass the arguments in reverse order: the size of a struct lock_file*, followed by the number to allocate. Rearrange them so they are in the correct order. Signed-off-by: Brian Gesiak Signed-off-by: Junio C Hamano

config: respect '~' and '~user' in mailmap.file

2014-05-27T19:59:32Z

git_config_string() does not handle '~' and '~user' as part of the value. Using git_config_pathname() fixes this. Signed-off-by: Øystein Walle Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jk/config-die-bad-number-noreturn'

2014-04-18T18:17:45Z

Squelch a false compiler warning from older gcc. * jk/config-die-bad-number-noreturn: config.c: mark die_bad_number as NORETURN

config.c: mark die_bad_number as NORETURN

2014-04-16T17:21:14Z

This can help avoid -Wuninitialized false positives in git_config_int and git_config_ulong, as the compiler now knows that we do not return "ret" if we hit the error codepath. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jk/config-path-include-fix' into maint

2014-03-18T21:00:15Z

include.path variable (or any variable that expects a path that can use ~username expansion) in the configuration file is not a boolean, but the code failed to check it. * jk/config-path-include-fix: handle_path_include: don't look at NULL value expand_user_path: do not look at NULL path

Merge branch 'ks/config-file-stdin'

2014-03-14T21:24:40Z

"git config" learned to read from the standard input when "-" is given as the value to its "--file" parameter (attempting an operation to update the configuration in the standard input of course is rejected). * ks/config-file-stdin: config: teach "git config --file -" to read from the standard input config: change git_config_with_options() interface builtin/config.c: rename check_blob_write() -> check_write() config: disallow relative include paths from blobs

Merge branch 'jc/core-checkstat-2.0'

2014-03-07T23:16:23Z

"core.statinfo" configuration variable, which was a never-advertised synonym to "core.checkstat", has been removed.

Merge branch 'jk/config-path-include-fix'

2014-02-27T22:01:25Z