godotengine/godot-git-plugin
1
0
Fork 0
mirror of https://github.com/godotengine/godot-git-plugin.git synced 2026-01-01 01:48:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add missing error check on git upstream check during push

Browse Source
This commit is contained in:
Twarit Waikar
2021-10-07 01:19:32 +05:30
parent 3190180025
commit eea6826d5e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
godot-git-plugin/src/git_api.cpp
View File

@@ -623,6 +623,8 @@ void GitAPI::_push(String remote, String username, String password) {
git_buf ref_name = {};
int error = git_branch_upstream_name(&ref_name, repo.get(), CString(branch_name).data);
// Set the upstream for the user's convenience
if (error == GIT_ENOTFOUND)
{
String push_ref_spec(branch_name + ":" + branch_name);
@@ -635,10 +637,13 @@ void GitAPI::_push(String remote, String username, String password) {
GIT2_CALL("Could not set branch upstream for " + branch_name,
git_branch_set_upstream, branch_object.get(), CString(remote + "/" + branch_name_short).data);
}
ref_name = {};
GIT2_CALL("Could not get upstream branch",
git_branch_upstream_name, &ref_name, repo.get(), CString(branch_name).data);
else
{
if (check_errors(error, "Could not get branch upstream", __FUNCTION__, __FILE__, __LINE__))
{
return;
}
}
CString pushspec(String() + branch_name);