X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-config.c;h=a2d656edb383da47fb3622f1f7c2d1524285ac00;hb=bba0fd22ad654460a81c4b35462b600d9432a869;hp=a81bc8bbf033fac83ad6deecbf4a67ba44e06a0b;hpb=96825a805419628c35f9fea70997aa749dbb2750;p=git.git diff --git a/builtin-config.c b/builtin-config.c index a81bc8bbf..a2d656edb 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -316,7 +316,8 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix) config_exclusive_filename = getenv(CONFIG_ENVIRONMENT); - argc = parse_options(argc, argv, builtin_config_options, builtin_config_usage, + argc = parse_options(argc, argv, prefix, builtin_config_options, + builtin_config_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (use_global_config + use_system_config + !!given_config_file > 1) { @@ -382,8 +383,8 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix) check_argc(argc, 0, 0); if (git_config(show_all_config, NULL) < 0) { if (config_exclusive_filename) - die("unable to read config file %s: %s", - config_exclusive_filename, strerror(errno)); + die_errno("unable to read config file '%s'", + config_exclusive_filename); else die("error processing config file(s)"); }