proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-15 23:17:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config: don't special-case multivars that don't exist yet

Browse Source 
This special-casing ignores that we might have a locked file, so the
hashtable does not represent the contents of the file we want to
write. This causes multivar writes to overwrite entries instead of add
to them when under lock.

There is no need for this as the normal code-path will write to the file
just fine, so simply get rid of it.
This commit is contained in:
Carlos Martín Nieto 2016-03-21 21:10:26 +01:00 committed by Edward Thomson
parent a1cf26448a
commit c86a65be4c
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/config_file.c
View File

@ -553,30 +553,15 @@ static int config_set_multivar(
git_config_backend *cfg, const char *name, const char *regexp, const char *value) git_config_backend *cfg, const char *name, const char *regexp, const char *value)
{ {
diskfile_backend *b = (diskfile_backend *)cfg; diskfile_backend *b = (diskfile_backend *)cfg;
refcounted_strmap *map;
git_strmap *values;
char *key; char *key;
regex_t preg; regex_t preg;
int result; int result;
khiter_t pos;
assert(regexp); assert(regexp);
if ((result = git_config__normalize_name(name, &key)) < 0) if ((result = git_config__normalize_name(name, &key)) < 0)
return result; return result;
map = refcounted_strmap_take(&b->header);
values = b->header.values->values;
pos = git_strmap_lookup_index(values, key);
if (!git_strmap_valid_index(values, pos)) {
/* If we don't have it, behave like a normal set */
result = config_set(cfg, name, value);
refcounted_strmap_free(map);
git__free(key);
return result;
}
result = regcomp(&preg, regexp, REG_EXTENDED); result = regcomp(&preg, regexp, REG_EXTENDED);
if (result != 0) { if (result != 0) {
giterr_set_regex(&preg, result); giterr_set_regex(&preg, result);
@ -591,7 +576,6 @@ static int config_set_multivar(
result = config_refresh(cfg); result = config_refresh(cfg);
out: out:
refcounted_strmap_free(map);
git__free(key); git__free(key);
regfree(&preg); regfree(&preg);

2
tests/config/multivar.c
View File

@ -163,7 +163,7 @@ void test_config_multivar__add_new(void)
cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); cl_git_pass(git_config_open_ondisk(&cfg, "config/config11"));
cl_git_pass(git_config_set_multivar(cfg, var, "", "variable")); cl_git_pass(git_config_set_multivar(cfg, var, "$^", "variable"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar_foreach(cfg, var, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, var, NULL, cb, &n));
cl_assert_equal_i(n, 1); cl_assert_equal_i(n, 1);