Merge pull request #5297 from MichaelEischer/fix-overwrite-behavior-help

restore: fix help message on invalid OverwriteBehavior
This commit is contained in:
Michael Eischer
2025-03-23 20:06:10 +01:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -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.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.Sparse, "sparse", false, "restore files as sparse")
f.BoolVar(&opts.Verify, "verify", false, "verify restored files content") 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") 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")
} }

View File

@@ -72,7 +72,7 @@ func (c *OverwriteBehavior) Set(s string) error {
*c = OverwriteNever *c = OverwriteNever
default: default:
*c = OverwriteInvalid *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 return nil