From 2b368dc8f02e1f320abd349a1f6c4ea31965f733 Mon Sep 17 00:00:00 2001
From: Elias Stiffel <elias@eclipsesource.com>
Date: Sat, 23 May 2026 17:46:54 +0200
Subject: [PATCH] fix(git): list_remotes ignores name-only inherited remote
 sections

Sibling to the has_remote fix on this branch (6d97335d). Plain `git remote`
lists remote names defined in any config layer, so a [remote "origin"]
section inherited from ~/.gitconfig (e.g. with `prune = true`) made
list_remotes return ["origin"] for fresh local vaults. That broke
git_add_remote (returned "already_configured") and silently neutered
disconnect_all_remotes.

Reuse remote::remote_line_has_url to parse `git remote -v` output and
keep only remotes with a non-empty URL column. Dedupe by name across
the (fetch)/(push) line pair.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src-tauri/src/git/connect.rs | 63 ++++++++++++++++++++++++++++++++++--
 src-tauri/src/git/remote.rs  |  2 +-
 2 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/src-tauri/src/git/connect.rs b/src-tauri/src/git/connect.rs
index 0f9f3a8b..88019a39 100644
--- a/src-tauri/src/git/connect.rs
+++ b/src-tauri/src/git/connect.rs
@@ -3,6 +3,7 @@ use std::path::Path;
 use std::process::Output;
 
 use super::credentials::request_remote_credentials;
+use super::remote::remote_line_has_url;
 use super::{ensure_author_config, git_command};
 
 const DEFAULT_REMOTE_NAME: &str = "origin";
@@ -185,14 +186,36 @@ fn current_branch(vault: &Path) -> Result<String, String> {
     Err(command_error("git branch --show-current", &output))
 }
 
+/// Return the names of remotes that have a URL configured locally.
+///
+/// Plain `git remote` lists every remote *name* defined in any config layer
+/// (system/global/local), so a `[remote "origin"]` section inherited from
+/// `~/.gitconfig` (e.g. one that only sets `prune = true`) would otherwise
+/// make a fresh local vault look like it already has a remote — breaking
+/// `git_add_remote` (returns `already_configured`) and silently neutering
+/// `disconnect_all_remotes`. We parse `git remote -v` and keep only lines
+/// whose URL column is non-empty, then dedupe by name across the
+/// `(fetch)` / `(push)` line pair.
 fn list_remotes(vault: &Path) -> Result<Vec<String>, String> {
-    let output = git_output(vault, &["remote"])?;
+    let output = git_output(vault, &["remote", "-v"])?;
 
     if !output.status.success() {
-        return Err(command_error("git remote", &output));
+        return Err(command_error("git remote -v", &output));
     }
 
-    Ok(stdout_lines(&output))
+    let mut names: Vec<String> = Vec::new();
+    for line in String::from_utf8_lossy(&output.stdout).lines() {
+        if !remote_line_has_url(line) {
+            continue;
+        }
+        let Some((name, _)) = line.split_once('\t') else { continue };
+        let name = name.trim().to_string();
+        if name.is_empty() || names.iter().any(|existing| existing == &name) {
+            continue;
+        }
+        names.push(name);
+    }
+    Ok(names)
 }
 
 fn unset_upstream(vault: &Path) {
@@ -468,6 +491,40 @@ mod tests {
         })
     }
 
+    /// Regression for the sibling of the "Sync failed" bug: a `[remote "origin"]`
+    /// section inherited from `~/.gitconfig` (e.g. one that only sets
+    /// `prune = true`) causes plain `git remote` to list "origin" even though
+    /// no URL is configured. `list_remotes` must look past the bare name and
+    /// require an actual URL — otherwise `git_add_remote` short-circuits with
+    /// `already_configured` and `disconnect_all_remotes` silently no-ops.
+    #[test]
+    fn list_remotes_ignores_name_only_remote_section() {
+        let dir = setup_git_repo();
+        let vault = dir.path();
+
+        // Create a [remote "origin"] section with a non-URL setting, mirroring
+        // what a global `~/.gitconfig` with `[remote "origin"] prune = true`
+        // does when its config is merged into this repo.
+        StdCommand::new("git")
+            .args(["config", "remote.origin.prune", "true"])
+            .current_dir(vault)
+            .output()
+            .unwrap();
+
+        // Sanity: bare `git remote` lists "origin" in this state.
+        let bare = StdCommand::new("git")
+            .args(["remote"])
+            .current_dir(vault)
+            .output()
+            .unwrap();
+        assert!(
+            String::from_utf8_lossy(&bare.stdout).contains("origin"),
+            "precondition: `git remote` should list the name-only origin section"
+        );
+
+        assert!(list_remotes(vault).unwrap().is_empty());
+    }
+
     #[test]
     fn disconnect_all_remotes_removes_every_remote() {
         let dir = setup_git_repo();
diff --git a/src-tauri/src/git/remote.rs b/src-tauri/src/git/remote.rs
index 8a40c250..06fd91b3 100644
--- a/src-tauri/src/git/remote.rs
+++ b/src-tauri/src/git/remote.rs
@@ -39,7 +39,7 @@ pub fn has_remote(vault_path: &str) -> Result<bool, String> {
 /// no URL configured the URL column is empty (`"origin\t"`). Returns true iff
 /// the URL column (after the tab, before any ` (fetch)` / ` (push)` suffix) is
 /// non-empty.
-fn remote_line_has_url(line: &str) -> bool {
+pub(super) fn remote_line_has_url(line: &str) -> bool {
     let Some((_name, rest)) = line.split_once('\t') else { return false };
     let url = rest
         .rsplit_once(' ')