Merge branch 'sp/stream-clean-filter'
When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * sp/stream-clean-filter: sha1_file: don't convert off_t to size_t too early to avoid potential die() convert: stream from fd to required clean filter to reduce used address space copy_fd(): do not close the input file descriptor mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT config.c: add git_env_ulong() to parse environment variable convert: drop arguments other than 'path' from would_convert_to_git()
This commit is contained in:
16
config.c
16
config.c
@ -1139,12 +1139,28 @@ const char *git_etc_gitconfig(void)
|
||||
return system_wide;
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse environment variable 'k' as a boolean (in various
|
||||
* possible spellings); if missing, use the default value 'def'.
|
||||
*/
|
||||
int git_env_bool(const char *k, int def)
|
||||
{
|
||||
const char *v = getenv(k);
|
||||
return v ? git_config_bool(k, v) : def;
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse environment variable 'k' as ulong with possibly a unit
|
||||
* suffix; if missing, use the default value 'val'.
|
||||
*/
|
||||
unsigned long git_env_ulong(const char *k, unsigned long val)
|
||||
{
|
||||
const char *v = getenv(k);
|
||||
if (v && !git_parse_ulong(v, &val))
|
||||
die("failed to parse %s", k);
|
||||
return val;
|
||||
}
|
||||
|
||||
int git_config_system(void)
|
||||
{
|
||||
return !git_env_bool("GIT_CONFIG_NOSYSTEM", 0);
|
||||
|
Reference in New Issue
Block a user