fix(flatpak): use flatpak-spawn --host for git and add Flatpak D-Bus permission

Author: cst8t

packaging/flatpak/com.cst8t.gitmun.yml

@@ -10,6 +10,7 @@ finish-args:
   - --socket=wayland
   - --device=dri
   - --filesystem=home
+  - --talk-name=org.freedesktop.Flatpak
 
 modules:
   - name: gitmun-files

src-tauri/src/avatar/forgejo.rs

@@ -2,7 +2,6 @@ use super::conditional::ConditionalProvider;
 use base64::{engine::general_purpose::STANDARD, Engine};
 use std::fs;
 use std::path::Path;
-use std::process::Command;
 use url::Url;
 
 // Forgejo/Gitea hash avatars using HMAC-SHA1 with an instance-secret, so
@@ -228,7 +227,7 @@ impl ForgejoProvider {
     }
 
     fn find_local_commit_sha(email: &str, repo_path: &str) -> Option<String> {
-        let output = Command::new("git")
+        let output = crate::git_command()
             .arg("-C")
             .arg(repo_path)
             .arg("log")

src-tauri/src/commands/history.rs

@@ -4,7 +4,6 @@ use crate::git::types::{
     RebaseResult, RepoRequest, ResetRequest, RevertCommitRequest, SignatureStatus,
 };
 use crate::AppState;
-use std::process::Command;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tauri::Manager;
 
@@ -37,15 +36,10 @@ pub async fn verify_commits(
     }
 
     tauri::async_runtime::spawn_blocking(move || -> Result<Vec<CommitVerification>, String> {
-        #[cfg(windows)]
-        const GIT: &str = "git.exe";
-        #[cfg(not(windows))]
-        const GIT: &str = "git";
-
         // Read the allowedSignersFile path directly from git config. This is
         // more reliable than detecting from stderr, since error message wording
         // can change across git versions.
-        let configured_signers = Command::new(GIT)
+        let configured_signers = crate::git_command()
             .current_dir(&repo_path)
             .args(["config", "--get", "gpg.ssh.allowedSignersFile"])
             .output()
@@ -90,7 +84,7 @@ pub async fn verify_commits(
             None
         };
 
-        let mut cmd = Command::new(GIT);
+        let mut cmd = crate::git_command();
         cmd.current_dir(&repo_path);
         if let Some(ref path) = signers_override {
             cmd.arg("-c")

src-tauri/src/commands/repo.rs

@@ -7,7 +7,7 @@ use crate::git::types::{
 };
 use crate::{configure_command, AppState, CloneCancelFlag};
 use std::io::Read;
-use std::process::{Command, Stdio};
+use std::process::Stdio;
 use std::sync::atomic::Ordering;
 use tauri::Manager;
 
@@ -79,15 +79,15 @@ pub fn init_repo(repo_path: String) -> Result<OperationResult, String> {
         });
     }
 
-    let mut command = Command::new("git");
+    let mut command = crate::git_command();
     configure_command(&mut command);
     command.arg("init").arg("-b").arg("main").current_dir(&path);
     let output = command
         .output()
         .map_err(|e| format!("Failed to launch git: {e}"))?;
 
     if !output.status.success() {
-        let mut fallback = Command::new("git");
+        let mut fallback = crate::git_command();
         configure_command(&mut fallback);
         fallback.arg("init").current_dir(&path);
         let fallback_output = fallback
@@ -130,7 +130,7 @@ pub async fn clone_repo(
     let dest_existed = final_dest.exists();
     let cleanup_path = final_dest_str.clone();
 
-    let mut cmd = Command::new("git");
+    let mut cmd = crate::git_command();
     configure_command(&mut cmd);
     cmd.args(["clone", "--progress", &repo_url, &final_dest_str])
         .stderr(Stdio::piped())

src-tauri/src/commands/settings.rs

@@ -2,8 +2,7 @@ use crate::git::types::{
     AvatarProviderMode, BackendMode, CommitDateMode, ExternalDiffTool, LinuxGraphicsMode,
     OperationResult, Settings, ThemeMode,
 };
-use crate::{configure_command, AppState};
-use std::process::Command;
+use crate::{configure_command, git_command, AppState};
 use tauri::Manager;
 
 #[tauri::command]
@@ -97,7 +96,7 @@ pub fn get_global_default_branch() -> Result<Option<String>, String> {
 }
 
 fn git_config_global_set(key: &str, value: &str) -> Result<(), String> {
-    let mut command = Command::new("git");
+    let mut command = git_command();
     configure_command(&mut command);
     let output = command
         .args(["config", "--global", key, value])
@@ -115,7 +114,7 @@ fn git_config_global_set(key: &str, value: &str) -> Result<(), String> {
 }
 
 fn git_config_global_get(key: &str) -> Result<Option<String>, String> {
-    let mut command = Command::new("git");
+    let mut command = git_command();
     configure_command(&mut command);
     let output = command
         .args(["config", "--global", "--get", key])
@@ -143,7 +142,7 @@ fn git_config_global_get(key: &str) -> Result<Option<String>, String> {
 }
 
 fn validate_branch_name(name: &str) -> Result<(), String> {
-    let mut command = Command::new("git");
+    let mut command = git_command();
     configure_command(&mut command);
     let output = command
         .args(["check-ref-format", "--branch", name])
@@ -163,7 +162,7 @@ fn validate_branch_name(name: &str) -> Result<(), String> {
 }
 
 fn git_config_global_unset(key: &str) -> Result<(), String> {
-    let mut command = Command::new("git");
+    let mut command = git_command();
     configure_command(&mut command);
     // --unset exits 5 when the key doesn't exist - treat that as success
     let output = command

src-tauri/src/git/cli.rs

@@ -101,7 +101,7 @@ impl CliGitHandler {
     }
 
     fn run_git_bytes(args: &[&str], current_dir: Option<&Path>) -> GitResult<Vec<u8>> {
-        let mut command = Command::new("git");
+        let mut command = crate::git_command();
         Self::configure_command(&mut command);
         command.args(args);
 
@@ -178,7 +178,7 @@ impl CliGitHandler {
         args: &[&str],
         current_dir: Option<&Path>,
     ) -> GitResult<()> {
-        let mut command = Command::new("git");
+        let mut command = crate::git_command();
         Self::configure_command(&mut command);
         command.args(overrides.iter().map(String::as_str)).args(args);
         if let Some(path) = current_dir {
@@ -208,7 +208,7 @@ impl CliGitHandler {
         current_dir: Option<&Path>,
         extra_ok_codes: &[i32],
     ) -> GitResult<String> {
-        let mut command = Command::new("git");
+        let mut command = crate::git_command();
         Self::configure_command(&mut command);
         command.args(args);
 
@@ -456,7 +456,7 @@ impl CliGitHandler {
         current_dir: &Path,
         stdin_data: &[u8],
     ) -> GitResult<String> {
-        let mut command = Command::new("git");
+        let mut command = crate::git_command();
         Self::configure_command(&mut command);
         command
             .args(args)
@@ -607,7 +607,7 @@ impl CliGitHandler {
     }
 
     fn get_diff_tool_name(repo_path: &Path) -> Option<String> {
-        let mut command = Command::new("git");
+        let mut command = crate::git_command();
         Self::configure_command(&mut command);
         let output = command
             .args(["config", "--get", "diff.tool"])
@@ -637,7 +637,7 @@ impl CliGitHandler {
     }
 
     fn get_merge_tool_name(repo_path: &Path) -> Option<String> {
-        let mut command = Command::new("git");
+        let mut command = crate::git_command();
         Self::configure_command(&mut command);
         let output = command
             .args(["config", "--get", "merge.tool"])
@@ -718,7 +718,7 @@ impl CliGitHandler {
                 cmd
             }
             _ => {
-                let mut cmd = Command::new("git");
+                let mut cmd = crate::git_command();
                 Self::configure_command(&mut cmd);
                 cmd.args(Self::difftool_cmd_overrides(tool_name))
                     .args(["difftool", "-y", "--tool", tool_name, "--no-index", "--"])

src-tauri/src/git/gix_handler.rs

@@ -559,7 +559,7 @@ impl GixGitHandler {
 
     fn detect_conflicted_files(git_dir: &Path) -> Vec<ConflictFileItem> {
         let repo_path = git_dir.parent().unwrap_or(git_dir);
-        let output = std::process::Command::new("git")
+        let output = crate::git_command()
             .args(["-c", "core.quotepath=false", "status", "--porcelain=v1"])
             .current_dir(repo_path)
             .output()
@@ -609,7 +609,7 @@ impl GixGitHandler {
     }
 
     fn collect_numstat(repo_path: &Path, staged: bool) -> HashMap<String, (u32, u32)> {
-        let mut command = std::process::Command::new("git");
+        let mut command = crate::git_command();
         command.arg("-c").arg("core.quotepath=false").arg("diff");
         if staged {
             command.arg("--cached");

src-tauri/src/lib.rs

@@ -31,6 +31,16 @@ pub(crate) fn configure_command(_command: &mut std::process::Command) {
     }
 }
 
+pub(crate) fn git_command() -> std::process::Command {
+    #[cfg(target_os = "linux")]
+    if std::env::var_os("FLATPAK_ID").is_some() {
+        let mut cmd = std::process::Command::new("flatpak-spawn");
+        cmd.args(["--host", "git"]);
+        return cmd;
+    }
+    std::process::Command::new("git")
+}
+
 /// Read linuxGraphicsMode from the saved config file without starting Tauri.
 /// Used to apply WebKit env vars before the WebView is initialised.
 #[cfg(target_os = "linux")]