mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/misc-cleanups' into HEAD

Browse Source 
* sb/misc-cleanups:
  submodule-config: don't shadow `cache`
  config.c: drop local variable
  credential-cache, send_request: close fd when done
  bundle: don't leak an fd in case of early return
  abbrev_sha1_in_line: don't leak memory
  notes: don't leak memory in git_config_get_notes_strategy
This commit is contained in:
Junio C Hamano
2016-05-18 14:40:15 -07:00
parent 989cbd4556 99dab16863
commit 66106691a1
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
submodule-config.c
View File

@ -30,7 +30,7 @@ enum lookup_type {
lookup_path
};
static struct submodule_cache cache;
static struct submodule_cache the_submodule_cache;
static int is_cache_init;
static int config_path_cmp(const struct submodule_entry *a,
@ -457,14 +457,14 @@ static void ensure_cache_init(void)
if (is_cache_init)
return;
cache_init(&cache);
cache_init(&the_submodule_cache);
is_cache_init = 1;
}
int parse_submodule_config_option(const char *var, const char *value)
{
struct parse_config_parameter parameter;
parameter.cache = &cache;
parameter.cache = &the_submodule_cache;
parameter.commit_sha1 = NULL;
parameter.gitmodules_sha1 = null_sha1;
parameter.overwrite = 1;
@ -477,18 +477,18 @@ const struct submodule *submodule_from_name(const unsigned char *commit_sha1,
const char *name)
{
ensure_cache_init();
return config_from_name(&cache, commit_sha1, name);
return config_from_name(&the_submodule_cache, commit_sha1, name);
}
const struct submodule *submodule_from_path(const unsigned char *commit_sha1,
const char *path)
{
ensure_cache_init();
return config_from_path(&cache, commit_sha1, path);
return config_from_path(&the_submodule_cache, commit_sha1, path);
}
void submodule_free(void)
{
cache_free(&cache);
cache_free(&the_submodule_cache);
is_cache_init = 0;
}