From 1a8e3496c3722ec3d11bcf443c022ea7bc669a0a Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 20 Mar 2026 20:51:26 +0300
Subject: [PATCH 1/2] Fixing NPE in GitXmlRpcSshService: removing explicit
 adding of resource from RT JAR.

---
 .../java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java b/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java
index 008372c..fb7e3d1 100644
--- a/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java
+++ b/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java
@@ -25,7 +25,6 @@
 import jakarta.inject.Singleton;
 import org.jetbrains.git4idea.rt.ssh.GitSSHHandler;
 import org.jetbrains.git4idea.rt.ssh.SSHMain;
-import org.jetbrains.git4idea.rt.ssh.SSHMainBundle;
 import org.jetbrains.git4idea.util.ScriptGenerator;
 
 import java.util.UUID;
@@ -47,7 +46,7 @@ public class GitXmlRpcSshService extends GitXmlRpcHandlerService<GitSSHGUIHandle
   @Override
   protected void customizeScriptGenerator(@Nonnull ScriptGenerator generator) {
     generator.addClasses(KnownHosts.class);
-    generator.addResource(SSHMainBundle.class, "/org/jetbrains/git4idea/ssh/SSHMainBundle.properties");
+    //generator.addResource(SSHMainBundle.class, "/org/jetbrains/git4idea/ssh/SSHMainBundle.properties");
   }
 
   @Nonnull

From ee560188c7084ec3a19acb65d244f4e882db0d14 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Fri, 20 Mar 2026 20:57:27 +0300
Subject: [PATCH 2/2] Removing obsolete methods in ScriptGenerator.

---
 .../git4idea/ssh/GitXmlRpcSshService.java     |  1 -
 .../git4idea/util/ScriptGenerator.java        | 26 -------------------
 2 files changed, 27 deletions(-)

diff --git a/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java b/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java
index fb7e3d1..55e34fc 100644
--- a/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java
+++ b/plugin/src/main/java/org/jetbrains/git4idea/ssh/GitXmlRpcSshService.java
@@ -46,7 +46,6 @@ public class GitXmlRpcSshService extends GitXmlRpcHandlerService<GitSSHGUIHandle
   @Override
   protected void customizeScriptGenerator(@Nonnull ScriptGenerator generator) {
     generator.addClasses(KnownHosts.class);
-    //generator.addResource(SSHMainBundle.class, "/org/jetbrains/git4idea/ssh/SSHMainBundle.properties");
   }
 
   @Nonnull
diff --git a/plugin/src/main/java/org/jetbrains/git4idea/util/ScriptGenerator.java b/plugin/src/main/java/org/jetbrains/git4idea/util/ScriptGenerator.java
index 1412117..f680f48 100644
--- a/plugin/src/main/java/org/jetbrains/git4idea/util/ScriptGenerator.java
+++ b/plugin/src/main/java/org/jetbrains/git4idea/util/ScriptGenerator.java
@@ -17,7 +17,6 @@
 
 import consulo.platform.Platform;
 import consulo.util.collection.ContainerUtil;
-import consulo.util.io.ClassPathUtil;
 import consulo.util.io.FileUtil;
 import consulo.util.io.NioFiles;
 import consulo.util.io.URLUtil;
@@ -124,18 +123,6 @@ private void addPath(String path) {
         }
     }
 
-    /**
-     * Add source for the specified resource
-     *
-     * @param base     the resource base
-     * @param resource the resource name
-     * @return this script generator
-     */
-    public ScriptGenerator addResource(Class base, String resource) {
-        addPath(getJarForResource(base, resource));
-        return this;
-    }
-
     /**
      * Add internal parameters for the script
      *
@@ -199,17 +186,4 @@ public String commandLine() {
         }
         return line;
     }
-
-    /**
-     * Get path for resources.jar
-     *
-     * @param context a context class
-     * @param res     a resource
-     * @return a path to classpath entry
-     */
-    @SuppressWarnings({"SameParameterValue"})
-    public static String getJarForResource(Class context, String res) {
-        String resourceRoot = ClassPathUtil.getResourceRoot(context, res);
-        return new File(resourceRoot).getAbsoluteFile().getAbsolutePath();
-    }
 }