From d60acc56978a221c5501a6095d273ac16a2c9f34 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sun, 23 Mar 2025 19:51:37 +0100 Subject: [PATCH 1/2] restore: fix help message on invalid OverwriteBehavior --- internal/restorer/restorer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/restorer/restorer.go b/internal/restorer/restorer.go index 977ed42a6..198cb11c3 100644 --- a/internal/restorer/restorer.go +++ b/internal/restorer/restorer.go @@ -72,7 +72,7 @@ func (c *OverwriteBehavior) Set(s string) error { *c = OverwriteNever default: *c = OverwriteInvalid - return fmt.Errorf("invalid overwrite behavior %q, must be one of (always|if-newer|never)", s) + return fmt.Errorf("invalid overwrite behavior %q, must be one of (always|if-changed|if-newer|never)", s) } return nil From f5989964ed56eee90eab775dae0e139529a6a4a2 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sun, 23 Mar 2025 19:54:22 +0100 Subject: [PATCH 2/2] restore: fix redundant default value for --overwrite option --- cmd/restic/cmd_restore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/restic/cmd_restore.go b/cmd/restic/cmd_restore.go index a29b8a19e..bb32333c9 100644 --- a/cmd/restic/cmd_restore.go +++ b/cmd/restic/cmd_restore.go @@ -84,7 +84,7 @@ func (opts *RestoreOptions) AddFlags(f *pflag.FlagSet) { f.BoolVar(&opts.DryRun, "dry-run", false, "do not write any data, just show what would be done") f.BoolVar(&opts.Sparse, "sparse", false, "restore files as sparse") f.BoolVar(&opts.Verify, "verify", false, "verify restored files content") - f.Var(&opts.Overwrite, "overwrite", "overwrite behavior, one of (always|if-changed|if-newer|never) (default: always)") + f.Var(&opts.Overwrite, "overwrite", "overwrite behavior, one of (always|if-changed|if-newer|never)") f.BoolVar(&opts.Delete, "delete", false, "delete files from target directory if they do not exist in snapshot. Use '--dry-run -vv' to check what would be deleted") }