fix: Do not overwrite sshCommand in git config (#3036)

To avoid messing with user settings. Fixes #2994 Signed-off-by: Dominik Schulz <[email protected]>
gopasspw · Jan 13, 2025 · 2c0a1a1 · 2c0a1a1
1 parent b6140bc
commit 2c0a1a1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/internal/backend/storage/gitfs/config.go b/internal/backend/storage/gitfs/config.go
@@ -40,8 +40,12 @@ func (g *Git) fixConfig(ctx context.Context) error {
 
 	// setup for persistent SSH connections.
 	if sc := gitSSHCommand(); sc != "" {
-		if err := g.ConfigSet(ctx, "core.sshCommand", sc); err != nil {
-			out.Errorf(ctx, "Error while configuring persistent SSH connections: %s", err)
+		ov, err := g.ConfigGet(ctx, "core.sshCommand")
+		// only set sshCommand if it's not already set. Avoid overwriting user settings.
+		if err != nil && ov == "" {
+			if err := g.ConfigSet(ctx, "core.sshCommand", sc); err != nil {
+				out.Errorf(ctx, "Error while configuring persistent SSH connections: %s", err)
+			}
 		}
 	}