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

Add force push implementation

Browse Source
This commit is contained in:
Twarit Waikar
2021-10-07 04:26:42 +05:30
parent 15c3bd0ad8
commit ac32fcc708
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/new_script.gd
View File

@@ -1,3 +1,4 @@
change4
extends Node extends Node

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

@@ -585,7 +585,7 @@ void GitAPI::_pull(String remote, String username, String password) {
Godot::print("GitAPI: Pull ended"); Godot::print("GitAPI: Pull ended");
} }
void GitAPI::_push(String remote, String username, String password) { void GitAPI::_push(const String remote, const String username, const String password, const bool force) {
Godot::print("GitAPI: Performing push to " + remote); Godot::print("GitAPI: Performing push to " + remote);
git_remote_ptr remote_object; git_remote_ptr remote_object;
@@ -614,7 +614,7 @@ void GitAPI::_push(String remote, String username, String password) {
String branch_name = _get_current_branch_name(true); String branch_name = _get_current_branch_name(true);
CString pushspec(String() + branch_name); CString pushspec(String() + (force ? "+" : "") + branch_name);
const git_strarray refspec = { &pushspec.data, 1 }; const git_strarray refspec = { &pushspec.data, 1 };
git_push_options push_options = GIT_PUSH_OPTIONS_INIT; git_push_options push_options = GIT_PUSH_OPTIONS_INIT;

2
godot-git-plugin/src/git_api.h
View File

@@ -91,7 +91,7 @@ class GitAPI : public EditorVCSInterface {
bool _initialize(const String project_root_path); bool _initialize(const String project_root_path);
bool _is_vcs_initialized(); bool _is_vcs_initialized();
void _pull(const String remote, const String username, const String password); void _pull(const String remote, const String username, const String password);
void _push(const String remote, const String username, const String password); void _push(const String remote, const String username, const String password, const bool force);
bool _shut_down(); bool _shut_down();
void _stage_file(const String file_path); void _stage_file(const String file_path);
void _unstage_file(const String file_path); void _unstage_file(const String file_path);