Remove --storage option for clone and rcs init

The "fs" backend was filtered out of the list of valid values for the `--storage` option on these commands. The only remaining option would be "gitfs", so there is no need for an option.
kpitt · Sep 27, 2022 · ac58b3d · ac58b3d
1 parent 35242af
commit ac58b3d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/internal/action/clone.go b/internal/action/clone.go
@@ -30,10 +30,6 @@ func (s *Action) Clone(c *cli.Context) error {
 		ctx = backend.WithCryptoBackendString(ctx, c.String("crypto"))
 	}
 
-	if c.IsSet("storage") {
-		ctx = backend.WithStorageBackendString(ctx, c.String("storage"))
-	}
-
 	path := c.String("path")
 
 	if c.Args().Len() < 1 {

diff --git a/internal/action/commands.go b/internal/action/commands.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/kpitt/gopass/internal/backend"
-	"github.com/kpitt/gopass/internal/set"
 	"github.com/kpitt/gopass/pkg/debug"
 	"github.com/urfave/cli/v2"
 )
@@ -143,10 +142,6 @@ func (s *Action) GetCommands() []*cli.Command {
 					Name:  "crypto",
 					Usage: fmt.Sprintf("Select crypto backend %v", backend.CryptoRegistry.BackendNames()),
 				},
-				&cli.StringFlag{
-					Name:  "storage",
-					Usage: fmt.Sprintf("Select storage backend %v", set.Filter(backend.StorageRegistry.BackendNames(), "fs")),
-				},
 				&cli.BoolFlag{
 					Name:  "check-keys",
 					Usage: "Check for valid decryption keys. Generate new keys if none are found.",
@@ -740,11 +735,6 @@ func (s *Action) GetCommands() []*cli.Command {
 							Aliases: []string{"useremail"},
 							Usage:   "Git Author Email",
 						},
-						&cli.StringFlag{
-							Name:  "storage",
-							Usage: fmt.Sprintf("Select storage backend %v", set.Filter(backend.StorageRegistry.BackendNames(), "fs")),
-							Value: "gitfs",
-						},
 					},
 				},
 				{

diff --git a/internal/action/rcs.go b/internal/action/rcs.go
@@ -24,15 +24,14 @@ func (s *Action) RCSInit(c *cli.Context) error {
 	store := c.String("store")
 	un := termio.DetectName(c.Context, c)
 	ue := termio.DetectEmail(c.Context, c)
-	ctx = backend.WithStorageBackendString(ctx, c.String("storage"))
 
 	// default to git.
 	if !backend.HasStorageBackend(ctx) {
 		ctx = backend.WithStorageBackend(ctx, backend.GitFS)
 	}
 
 	if err := s.rcsInit(ctx, store, un, ue); err != nil {
-		return exit.Error(exit.Git, err, "failed to initialize %s: %s", backend.StorageBackendName(backend.GetStorageBackend(ctx)), err)
+		return exit.Error(exit.Git, err, "failed to initialize git: %s", err)
 	}
 
 	return nil
@@ -58,10 +57,10 @@ func (s *Action) rcsInit(ctx context.Context, store, un, ue string) error {
 			out.Printf(ctx, "Git initialization failed. You may want to try to 'export GPG_TTY=$(tty)' and start over.")
 		}
 
-		return fmt.Errorf("failed to run RCS init: %w", err)
+		return fmt.Errorf("failed to run git init: %w", err)
 	}
 
-	out.Printf(ctx, "Initialized %s repository (%s) for %s / %s...", be, bn, un, ue)
+	out.Printf(ctx, "Initialized git repository for %q <%s>...", un, ue)
 
 	return nil
 }