MrUnknownDE/vcc-tools
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/vcc-tools.git synced 2026-05-05 22:56:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: git credentials manager issue

Browse Source
This commit is contained in:
MrUnknownDE
2026-05-05 20:00:09 +02:00
parent a3a23902ab
commit a3eb6cf71f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/GitPanel.cs
+12 -7
View File
@@ -293,16 +293,20 @@ public class GitPanel : EditorWindow
GUI.backgroundColor = new Color(0.2f, 0.4f, 0.8f); GUI.backgroundColor = new Color(0.2f, 0.4f, 0.8f);
if (GUILayout.Button("✓ Push", GUILayout.Height(30))) if (GUILayout.Button("✓ Push", GUILayout.Height(30)))
{ {
// Unity APIs must stay on the main thread
UnityEditor.SceneManagement.EditorSceneManager.SaveOpenScenes(); UnityEditor.SceneManagement.EditorSceneManager.SaveOpenScenes();
AssetDatabase.SaveAssets(); AssetDatabase.SaveAssets();
if (string.IsNullOrWhiteSpace(commitMessage)) SetDefaultCommitMessage(); if (string.IsNullOrWhiteSpace(commitMessage)) SetDefaultCommitMessage();
ExportPackageInventory(); string msgSnapshot = commitMessage;
RunGitCommand("add .", true);
RunGitCommand($"commit -m \"{commitMessage}\"", true);
RunNetworkCommand("Pushing to remote... (a browser window may open for authentication)", RunNetworkCommand("Committing and pushing... (a browser window may open for authentication)",
() => RunGitCommand("push -u origin HEAD", true, 180000), () =>
{
ExportPackageInventory();
RunGitCommand("add .", true);
RunGitCommand($"commit -m \"{msgSnapshot}\"", true);
return RunGitCommand("push -u origin HEAD", true, 180000);
},
result => result =>
{ {
if (result.Contains("rejected") || result.Contains("fetch first")) if (result.Contains("rejected") || result.Contains("fetch first"))
@@ -603,8 +607,9 @@ public class GitPanel : EditorWindow
RedirectStandardError = true, RedirectStandardError = true,
CreateNoWindow = true CreateNoWindow = true
}; };
// Block stdin credential prompts (no TTY in Unity), but allow GCM browser/GUI auth // Block stdin prompts (no TTY in Unity), but force GCM to use browser/GUI auth
si.EnvironmentVariables["GIT_TERMINAL_PROMPT"] = "0"; si.EnvironmentVariables["GIT_TERMINAL_PROMPT"] = "0";
si.EnvironmentVariables["GCM_INTERACTIVE"] = "always";
si.EnvironmentVariables["GIT_SSH_COMMAND"] = "ssh -o BatchMode=yes -o ConnectTimeout=15"; si.EnvironmentVariables["GIT_SSH_COMMAND"] = "ssh -o BatchMode=yes -o ConnectTimeout=15";
var stdout = new System.Text.StringBuilder(); var stdout = new System.Text.StringBuilder();