Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.0.2 2014-06-25T18:45:55Z 2014-06-25T18:45:55Z Junio C Hamano gitster@pobox.com 2014-06-25T18:45:55Z urn:sha1:fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6 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 2014-05-27T19:59:32Z Øystein Walle oystwa@gmail.com 2014-05-27T08:45:58Z urn:sha1:9352fd570876ea0faf9f12251ecea06954fbe59b git_config_string() does not handle '~' and '~user' as part of the value. Using git_config_pathname() fixes this. Signed-off-by: Øystein Walle <oystwa@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-04-18T18:17:45Z Junio C Hamano gitster@pobox.com 2014-04-18T18:17:44Z urn:sha1:531675ad172f984a6dbc2ac840caaf6ba1015eb0 Squelch a false compiler warning from older gcc. * jk/config-die-bad-number-noreturn: config.c: mark die_bad_number as NORETURN 2014-04-16T17:21:14Z Jeff King peff@peff.net 2014-04-16T16:51:47Z urn:sha1:06bdc23b7e5b20ab06bf0feb3d463d032978992f 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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-03-18T21:00:15Z Junio C Hamano gitster@pobox.com 2014-03-18T21:00:15Z urn:sha1:6f0166771aadeb069b8952255414d67b643db1bf 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 2014-03-14T21:24:40Z Junio C Hamano gitster@pobox.com 2014-03-14T21:24:40Z urn:sha1:08f36302b5d04cf06a35acc91689b0278cbf6a73 "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 2014-03-07T23:16:23Z Junio C Hamano gitster@pobox.com 2014-03-07T23:16:22Z urn:sha1:2b4a888069b65ab7a6b6291a15ee044705222334 "core.statinfo" configuration variable, which was a never-advertised synonym to "core.checkstat", has been removed. 2014-02-27T22:01:25Z Junio C Hamano gitster@pobox.com 2014-02-27T22:01:25Z urn:sha1:bfef492d769cbea25c3cd951fe452be85402b160 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 2014-02-19T00:12:14Z Kirill A. Shutemov kirill@shutemov.name 2014-02-18T22:58:55Z urn:sha1:3caec73b5568341c5d8f303692423a8e9fb0cb39 The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2014-02-19T00:12:13Z Kirill A. Shutemov kirill@shutemov.name 2014-02-18T22:58:54Z urn:sha1:c8985ce05360857733738561dd6cdf964470cbdf We're going to have more options for config source. Let's alter git_config_with_options() interface to accept struct with all source options. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>