Merge pull request #6069 from Byron/signing

Fix Signing

Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.dependencies]
 bstr = "1.11.1"
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { git = "https://github.com/GitoxideLabs/gitoxide", rev = "cc7b614e541aa4a485f470f36516589619e2de5e", default-features = false, features = [
+gix = { git = "https://github.com/GitoxideLabs/gitoxide", rev = "f58f3ea9636dfc53fde5458510af4dd08be53dec", default-features = false, features = [
 ] }
 gix-testtools = "0.15.0"
 insta = "1.41.1"

apps/desktop/src/routes/+layout.svelte

@@ -160,6 +160,13 @@
 		// Toggle v3 design on/off
 		'v 3': () => {
 			settingsService.updateFeatureFlags({ v3: !$settingsStore?.featureFlags.v3 });
+		},
+		// This is a debug tool to learn about environment variables actually present - only available if the backend is in debug mode.
+		'e n v': async () => {
+			let env = await invoke('env_vars');
+			console.log(env);
+			(window as any).tauriEnv = env;
+			console.log('Also written to window.tauriEnv');
 		}
 	});
 </script>

crates/gitbutler-repo/src/repository_ext.rs

@@ -582,6 +582,7 @@ fn prepare_with_shell(program: impl Into<OsString>) -> gix::command::Prepare {
             .with_shell_program(gix::path::env::shell())
             // force using a shell, we want access to additional programs here
             .with_shell()
+            .with_quoted_command()
     } else {
         prepare
     }

crates/gitbutler-tauri/src/env.rs

@@ -0,0 +1,7 @@
+use std::collections::BTreeMap;
+
+#[cfg(debug_assertions)]
+#[tauri::command(async)]
+pub fn env_vars() -> BTreeMap<String, String> {
+    std::env::vars().collect()
+}

crates/gitbutler-tauri/src/lib.rs

@@ -42,6 +42,7 @@ pub mod stack;
 pub mod zip;
 
 pub mod diff;
+pub mod env;
 pub mod workspace;
 
 /// Utility types that make it easier to transform data from the frontend to the backend.

crates/gitbutler-tauri/src/main.rs

@@ -14,8 +14,9 @@
 use gitbutler_settings::AppSettingsWithDiskSync;
 use gitbutler_tauri::settings::SettingsStore;
 use gitbutler_tauri::{
-    askpass, commands, config, diff, forge, github, logs, menu, modes, open, projects, remotes,
-    repo, secret, settings, stack, undo, users, virtual_branches, workspace, zip, App, WindowState,
+    askpass, commands, config, diff, env, forge, github, logs, menu, modes, open, projects,
+    remotes, repo, secret, settings, stack, undo, users, virtual_branches, workspace, zip, App,
+    WindowState,
 };
 use tauri::Emitter;
 use tauri::{generate_context, Manager};
@@ -250,7 +251,10 @@ fn main() {
                     workspace::stacks,
                     diff::worktree_changes,
                     diff::commit_changes,
-                    diff::tree_change_diffs
+                    diff::tree_change_diffs,
+                    // `env_vars` is only supposed to be avaialble in debug mode, not in production.
+                    #[cfg(debug_assertions)]
+                    env::env_vars,
                 ])
                 .menu(menu::build)
                 .on_window_event(|window, event| match event {