From 02f48df4279bc0b5a54566a9780588bf96a5f2b1 Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Tue, 26 Feb 2013 19:21:17 +0800 Subject: [PATCH] Fix commit dialog crash when using libgit2 to commit After associating config with repository, do not call git_config_free() after calling git_repository_free() git_repository_free() calls git_config_free() internally Fix regression of 9673785ccf300f424ac3ddd04cf8508eb93ce696 Signed-off-by: Sup Yut Sum --- src/TortoiseProc/CommitDlg.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp index 1e07b8ae7..a2360e826 100644 --- a/src/TortoiseProc/CommitDlg.cpp +++ b/src/TortoiseProc/CommitDlg.cpp @@ -662,7 +662,6 @@ void CCommitDlg::OnOK() if (g_Git.GetHash(revHash, revRef)) { git_repository_free(repository); - git_config_free(config); MessageBox(g_Git.GetLibGit2LastErr(_T("Could not get HEAD hash after committing.")), _T("TortoiseGit"), MB_ICONERROR); break; } @@ -671,7 +670,6 @@ void CCommitDlg::OnOK() if (!revHash.IsEmpty() && git_commit_lookup(&commit, repository, (const git_oid*)revHash.m_hash)) { git_repository_free(repository); - git_config_free(config); CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not get last commit.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR); break; } @@ -681,7 +679,6 @@ void CCommitDlg::OnOK() { git_commit_free(commit); git_repository_free(repository); - git_config_free(config); CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not read tree of commit.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR); break; } @@ -694,7 +691,6 @@ void CCommitDlg::OnOK() if (commit != nullptr) git_commit_free(commit); git_repository_free(repository); - git_config_free(config); CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not get the repository index.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR); break; } @@ -706,7 +702,6 @@ void CCommitDlg::OnOK() git_tree_free(tree); git_commit_free(commit); git_repository_free(repository); - git_config_free(config); CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not read the tree into the index.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR); break; } @@ -795,7 +790,6 @@ void CCommitDlg::OnOK() if (commit != nullptr) git_commit_free(commit); git_repository_free(repository); - git_config_free(config); } while (0); } else -- 2.11.4.GIT