Commit 9562ebcd by Carlos Martín Nieto

Merge pull request #3424 from arthurschreiber/arthur/transaction-dont-free-config

Don't free config in `git_transaction_commit`.
parents 1e80bf27 548cb334
...@@ -331,7 +331,6 @@ int git_transaction_commit(git_transaction *tx) ...@@ -331,7 +331,6 @@ int git_transaction_commit(git_transaction *tx)
if (tx->type == TRANSACTION_CONFIG) { if (tx->type == TRANSACTION_CONFIG) {
error = git_config_unlock(tx->cfg, true); error = git_config_unlock(tx->cfg, true);
git_config_free(tx->cfg);
tx->cfg = NULL; tx->cfg = NULL;
return error; return error;
......
...@@ -670,6 +670,16 @@ void test_config_write__locking(void) ...@@ -670,6 +670,16 @@ void test_config_write__locking(void)
git_transaction_free(tx); git_transaction_free(tx);
/* Now that we've unlocked it, we should see both updates */ /* Now that we've unlocked it, we should see both updates */
cl_git_pass(git_config_get_entry(&entry, cfg, "section.name"));
cl_assert_equal_s("other value", entry->value);
git_config_entry_free(entry);
cl_git_pass(git_config_get_entry(&entry, cfg, "section2.name3"));
cl_assert_equal_s("more value", entry->value);
git_config_entry_free(entry);
git_config_free(cfg);
/* We should also see the changes after reopening the config */
cl_git_pass(git_config_open_ondisk(&cfg, filename)); cl_git_pass(git_config_open_ondisk(&cfg, filename));
cl_git_pass(git_config_get_entry(&entry, cfg, "section.name")); cl_git_pass(git_config_get_entry(&entry, cfg, "section.name"));
cl_assert_equal_s("other value", entry->value); cl_assert_equal_s("other value", entry->value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment