Merge pull request #189 from fries1234/fix-comparison-bug

fix a comparision bug with renamed git statuses

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   linux-x64:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: build-linux-editor-x64

.gitmodules

@@ -5,6 +5,7 @@
 [submodule "libgit2"]
 	path = thirdparty/git2/libgit2
 	url = https://github.com/libgit2/libgit2
+	ignore = untracked
 [submodule "thirdparty/ssh2/libssh2"]
 	path = thirdparty/ssh2/libssh2
 	url = https://github.com/libssh2/libssh2

demo/addons/godot-git-plugin/git_plugin.gdextension

@@ -1,6 +1,7 @@
 [configuration]
 
 entry_symbol = "git_plugin_init"
+compatibility_minimum = "4.1.0"
 
 [libraries]
 

demo/addons/godot-git-plugin/plugin.cfg

@@ -3,5 +3,5 @@
 name="Godot Git Plugin"
 description="This plugin lets you interact with Git without leaving the Godot editor. More information can be found at https://github.com/godotengine/godot-git-plugin/wiki"
 author="twaritwaikar"
-version="v3.0.0-beta1"
+version="v3.0.1"
 script="godot-git-plugin.gd"

demo/project.godot

@@ -10,7 +10,7 @@ config_version=5
 
 [application]
 
-config/features=PackedStringArray("4.0")
+config/features=PackedStringArray("4.1")
 
 [editor]
 

godot-git-plugin/src/gdlibrary.cpp

@@ -19,8 +19,8 @@ void uninitialize_git_plugin_module(godot::ModuleInitializationLevel p_level) {
 
 extern "C" {
 
-GDExtensionBool GDE_EXPORT git_plugin_init(const GDExtensionInterface *p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
-	godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
+GDExtensionBool GDE_EXPORT git_plugin_init(const GDExtensionInterfaceGetProcAddress p_address, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+	godot::GDExtensionBinding::InitObject init_obj(p_address, p_library, r_initialization);
 
 	init_obj.register_initializer(initialize_git_plugin_module);
 	init_obj.register_terminator(uninitialize_git_plugin_module);

godot-git-plugin/src/git_callbacks.cpp

@@ -82,16 +82,18 @@ extern "C" int credentials_cb(git_cred **out, const char *url, const char *usern
 
 	godot::String proper_username = username_from_url ? username_from_url : creds->username;
 
-	if (allowed_types & GIT_CREDENTIAL_USERPASS_PLAINTEXT) {
-		return git_cred_userpass_plaintext_new(out, CString(proper_username).data, CString(creds->password).data);
+	if (!creds->ssh_public_key_path.is_empty()) {
+		if (allowed_types & GIT_CREDENTIAL_SSH_KEY) {
+			return git_credential_ssh_key_new(out,
+					CString(proper_username).data,
+					CString(creds->ssh_public_key_path).data,
+					CString(creds->ssh_private_key_path).data,
+					CString(creds->ssh_passphrase).data);
+		}
 	}
 
-	if (allowed_types & GIT_CREDENTIAL_SSH_KEY) {
-		return git_credential_ssh_key_new(out,
-				CString(proper_username).data,
-				CString(creds->ssh_public_key_path).data,
-				CString(creds->ssh_private_key_path).data,
-				CString(creds->ssh_passphrase).data);
+	if (allowed_types & GIT_CREDENTIAL_USERPASS_PLAINTEXT) {
+		return git_cred_userpass_plaintext_new(out, CString(proper_username).data, CString(creds->password).data);
 	}
 
 	if (allowed_types & GIT_CREDENTIAL_USERNAME) {

godot-git-plugin/src/git_plugin.cpp

@@ -245,7 +245,7 @@ godot::TypedArray<godot::Dictionary> GitPlugin::_get_modified_files_data() {
 		}
 
 		if (entry->status & git_status_index) {
-			if (entry->status == GIT_STATUS_INDEX_RENAMED) {
+			if (entry->status & GIT_STATUS_INDEX_RENAMED) {
 				godot::String old_path = entry->head_to_index->old_file.path;
 				stats_files.push_back(create_status_file(old_path, map_changes.at(GIT_STATUS_INDEX_DELETED), TREE_AREA_STAGED));
 				stats_files.push_back(create_status_file(path, map_changes.at(GIT_STATUS_INDEX_NEW), TREE_AREA_STAGED));

thirdparty/ssh2/SCsub

@@ -31,6 +31,7 @@ libssh2_sources = [
     "libssh2/src/misc.c",
     "libssh2/src/pem.c",
     "libssh2/src/session.c",
+    "libssh2/src/userauth_kbd_packet.c",
     "libssh2/src/userauth.c",
 ]