From 6508b5b1529e47e297871ef1a44b2120e53cf6d8 Mon Sep 17 00:00:00 2001
From: Dominik Schulz <dominik.schulz@gmail.com>
Date: Mon, 13 Nov 2017 14:00:38 +0100
Subject: [PATCH] Set git gpg.program if possible (#464)

Fixes #451
---
 backend/git/cli/config.go         |  9 ++++++++-
 backend/git/cli/config_others.go  | 10 ----------
 backend/git/cli/config_windows.go | 20 --------------------
 3 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 backend/git/cli/config_others.go
 delete mode 100644 backend/git/cli/config_windows.go

diff --git a/backend/git/cli/config.go b/backend/git/cli/config.go
index 0a9d1807e5..edac85f337 100644
--- 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
deleted file mode 100644
index c01a32b830..0000000000
--- a/backend/git/cli/config_others.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !windows
-
-package cli
-
-import "context"
-
-func (g *Git) fixConfigOSDep(ctx context.Context) error {
-	// nothing to do
-	return nil
-}
diff --git a/backend/git/cli/config_windows.go b/backend/git/cli/config_windows.go
deleted file mode 100644
index cf31fe2bf6..0000000000
--- a/backend/git/cli/config_windows.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// +build windows
-
-package cli
-
-import (
-	"context"
-
-	"github.com/pkg/errors"
-)
-
-func (g *Git) fixConfigOSDep(ctx context.Context) error {
-	if g.gpg == "" {
-		return nil
-	}
-
-	if err := g.Cmd(ctx, "gitFixConfigOSDep", "config", "--local", "gpg.program", g.gpg); err != nil {
-		return errors.Wrapf(err, "failed to set git config gpg.program")
-	}
-	return nil
-}