#5662: Fill in the user name and email from git's config store

codereader · Jul 18, 2021 · 7dfe9e2 · 7dfe9e2
1 parent 64bedf4
commit 7dfe9e2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/plugins/vcs/Repository.cpp b/plugins/vcs/Repository.cpp
@@ -310,6 +310,32 @@ void Repository::createCommit(const CommitMetadata& metadata)
 
 }
 
+std::string Repository::getConfigValue(const std::string& key)
+{
+    git_config* config;
+    auto error = git_repository_config_snapshot(&config, _repository);
+    GitException::ThrowOnError(error);
+
+    try
+    {
+        const char* value;
+        auto error = git_config_get_string(&value, config, key.c_str());
+        GitException::ThrowOnError(error);
+
+        // Copy the value before free-ing the config
+        std::string returnValue(value);
+
+        git_config_free(config);
+
+        return returnValue;
+    }
+    catch (const GitException& ex)
+    {
+        git_config_free(config);
+        throw ex;
+    }
+}
+
 bool Repository::isReadyForMerge()
 {
     auto state = git_repository_state(_repository);

diff --git a/plugins/vcs/Repository.h b/plugins/vcs/Repository.h
@@ -83,6 +83,8 @@ class Repository final
 
     void createCommit(const CommitMetadata& metadata);
 
+    std::string getConfigValue(const std::string& key);
+
     // Creates a new instance of this repository, not sharing any libgit2 handles with the original
     std::shared_ptr<Repository> clone();
 

diff --git a/plugins/vcs/ui/VcsStatus.cpp b/plugins/vcs/ui/VcsStatus.cpp
@@ -310,19 +310,24 @@ void VcsStatus::performCommit()
         _taskInProgress = true;
     }
 
-    git::CommitMetadata metadata;
-    metadata = CommitDialog::RunDialog(metadata);
-
-    if (metadata.isValid())
+    try
     {
-        try
+        git::CommitMetadata metadata;
+
+        metadata.name = _repository->getConfigValue("user.name");
+        metadata.email = _repository->getConfigValue("user.email");
+
+        metadata = CommitDialog::RunDialog(metadata);
+
+        if (metadata.isValid())
         {
+
             _repository->createCommit(metadata);
         }
-        catch (const git::GitException& ex)
-        {
-            wxutil::Messagebox::ShowError(ex.what());
-        }
+    }
+    catch (const git::GitException& ex)
+    {
+        wxutil::Messagebox::ShowError(ex.what());
     }
 
     {