Set git gpg.program if possible (#464)

Fixes #451
gopasspw · Nov 13, 2017 · 6508b5b · 6508b5b
1 parent a151856
commit 6508b5b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 31 deletions.
diff --git a/backend/git/cli/config.go b/backend/git/cli/config.go
@@ -35,7 +35,14 @@ func (g *Git) fixConfig(ctx context.Context) error {
 		out.Yellow(ctx, "Error while initializing git: %s", err)
 	}
 
-	return g.fixConfigOSDep(ctx)
+	if g.gpg == "" {
+		return nil
+	}
+
+	if err := g.Cmd(ctx, "gitFixConfig", "config", "--local", "gpg.program", g.gpg); err != nil {
+		return errors.Wrapf(err, "failed to set git config gpg.program")
+	}
+	return nil
 }
 
 // InitConfig initialized and preparse the git config

diff --git a/backend/git/cli/config_others.go b/backend/git/cli/config_others.go
diff --git a/backend/git/cli/config_windows.go b/backend/git/cli/config_windows.go