Commit d6b7e40497097e4e540962b8efc6a1661b5739a4
2015-05-04T07:36:21
config: test all multivars are updated If a multivar exists within two sections (of the same name) then they should both be updated in a `set_multivar`. Ensure that this is the case.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/tests/config/write.c b/tests/config/write.c
index f497731..2e7b818 100644
--- a/tests/config/write.c
+++ b/tests/config/write.c
@@ -230,12 +230,24 @@ void test_config_write__overwrite_value_with_duplicate_header(void)
git_config_free(cfg);
}
+static int multivar_cb(const git_config_entry *entry, void *data)
+{
+ int *n = (int *)data;
+
+ cl_assert_equal_s(entry->value, "newurl");
+
+ (*n)++;
+
+ return 0;
+}
+
void test_config_write__overwrite_multivar_within_duplicate_header(void)
{
const char *file_name = "config-duplicate-header";
const char *entry_name = "remote.origin.url";
git_config *cfg;
git_config_entry *entry;
+ int n = 0;
/* This config can occur after removing and re-adding the origin remote */
const char *file_content =
@@ -253,17 +265,15 @@ void test_config_write__overwrite_multivar_within_duplicate_header(void)
/* Update that entry */
cl_git_pass(git_config_set_multivar(cfg, entry_name, ".*", "newurl"));
-
- /* Reopen the file and make sure the entry was updated */
git_config_entry_free(entry);
git_config_free(cfg);
- cl_git_pass(git_config_open_ondisk(&cfg, file_name));
- cl_git_pass(git_config_get_entry(&entry, cfg, entry_name));
- cl_assert_equal_s("newurl", entry->value);
+ /* Reopen the file and make sure the entry was updated */
+ cl_git_pass(git_config_open_ondisk(&cfg, file_name));
+ cl_git_pass(git_config_get_multivar_foreach(cfg, entry_name, NULL, multivar_cb, &n));
+ cl_assert_equal_i(2, n);
/* Cleanup */
- git_config_entry_free(entry);
git_config_free(cfg);
}