wip

.github/workflows/docker.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Log in to the Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -33,7 +33,7 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -45,7 +45,7 @@ jobs:
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226
 
       - name: Ensure consistent binaries
         run: |
@@ -55,7 +55,7 @@ jobs:
         if: github.ref != 'refs/heads/master'
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           push: true
           context: .

.github/workflows/tests.yml

@@ -66,9 +66,6 @@ jobs:
       GOPROXY: https://proxy.golang.org
 
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v5
         with:
@@ -77,7 +74,7 @@ jobs:
       - name: Get programs (Linux/macOS)
         run: |
           echo "build Go tools"
-          go install github.com/restic/rest-server/cmd/rest-server@master
+          go install github.com/restic/rest-server/cmd/rest-server@latest
 
           echo "install minio server"
           mkdir $HOME/bin
@@ -109,7 +106,7 @@ jobs:
           $ProgressPreference = 'SilentlyContinue'
 
           echo "build Go tools"
-          go install github.com/restic/rest-server/cmd/rest-server@master
+          go install github.com/restic/rest-server/...
 
           echo "install minio server"
           mkdir $Env:USERPROFILE/bin
@@ -142,6 +139,9 @@ jobs:
           echo $Env:USERPROFILE\tar\bin >> $Env:GITHUB_PATH
         if: matrix.os == 'windows-latest'
 
+      - name: Check out code
+        uses: actions/checkout@v4
+
       - name: Build with build.go
         run: |
           go run build.go
@@ -230,14 +230,14 @@ jobs:
     name: Cross Compile for subset ${{ matrix.subset }}
 
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
       - name: Set up Go ${{ env.latest_go }}
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.latest_go }}
 
+      - name: Check out code
+        uses: actions/checkout@v4
+
       - name: Cross-compile for subset ${{ matrix.subset }}
         run: |
           mkdir build-output build-output-debug
@@ -247,24 +247,20 @@ jobs:
   lint:
     name: lint
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      # allow annotating code in the PR
-      checks: write
     steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
       - name: Set up Go ${{ env.latest_go }}
         uses: actions/setup-go@v5
         with:
           go-version: ${{ env.latest_go }}
 
+      - name: Check out code
+        uses: actions/checkout@v4
+
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.57.1
+          version: v1.56.1
           args: --verbose --timeout 5m
 
         # only run golangci-lint for pull requests, otherwise ALL hints get
@@ -302,7 +298,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -325,7 +321,7 @@ jobs:
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
         with:
           push: false
           context: .

.golangci.yml

@@ -38,8 +38,6 @@ linters:
     # ensure that http response bodies are closed
     - bodyclose
 
-    - importas
-
 issues:
   # don't use the default exclude rules, this hides (among others) ignored
   # errors from Close() calls
@@ -60,10 +58,4 @@ issues:
   exclude-rules:
     # revive: ignore unused parameters in tests
     - path: (_test\.go|testing\.go|backend/.*/tests\.go)
-      text: "unused-parameter:"
-
-linters-settings:
-  importas:
-    alias:
-      - pkg: github.com/restic/restic/internal/test
-        alias: rtest
+      text: "unused-parameter:"

README.md

@@ -10,7 +10,8 @@ For detailed usage and installation instructions check out the [documentation](h
 
 You can ask questions in our [Discourse forum](https://forum.restic.net).
 
-## Quick start
+Quick start
+-----------
 
 Once you've [installed](https://restic.readthedocs.io/en/latest/020_installation.html) restic, start
 off with creating a repository for your backups:
@@ -58,7 +59,7 @@ Therefore, restic supports the following backends for storing backups natively:
 Restic is a program that does backups right and was designed with the
 following principles in mind:
 
--  **Easy**: Doing backups should be a frictionless process, otherwise
+-  **Easy:** Doing backups should be a frictionless process, otherwise
    you might be tempted to skip it. Restic should be easy to configure
    and use, so that, in the event of a data loss, you can just restore
    it. Likewise, restoring data should not be complicated.
@@ -91,17 +92,20 @@ reproduce a byte identical version from the source code for that
 release. Instructions on how to do that are contained in the
 [builder repository](https://github.com/restic/builder).
 
-## News
+News
+----
 
-You can follow the restic project on Mastodon [@resticbackup](https://fosstodon.org/@restic) or subscribe to
+You can follow the restic project on Mastodon [@resticbackup](https://fosstodon.org/@restic) or by subscribing to
 the [project blog](https://restic.net/blog/).
 
-## License
+License
+-------
 
 Restic is licensed under [BSD 2-Clause License](https://opensource.org/licenses/BSD-2-Clause). You can find the
-complete text in [`LICENSE`](LICENSE).
+complete text in [``LICENSE``](LICENSE).
 
-## Sponsorship
+Sponsorship
+-----------
 
 Backend integration tests for Google Cloud Storage and Microsoft Azure Blob
 Storage are sponsored by [AppsCode](https://appscode.com)!

VERSION

@@ -1 +1 @@
-0.17.2
+0.16.4

changelog/0.10.0_2020-09-19/pull-2195

@@ -10,7 +10,7 @@ https://github.com/restic/restic/issues/2244
 
 NOTE: This new implementation does not guarantee order in which blobs
 are written to the target files and, for example, the last blob of a
-file can be written to the file before any of the preceding file blobs.
+file can be written to the file before any of the preceeding file blobs.
 It is therefore possible to have gaps in the data written to the target
 files if restore fails or interrupted by the user.
 

changelog/0.12.0_2021-02-14/issue-3232

@@ -1,7 +1,7 @@
-Bugfix: Correct statistics for overlapping backup sources
+Bugfix: Correct statistics for overlapping targets
 
 A user reported that restic's statistics and progress information during backup
-was not correctly calculated when the backup sources (files/dirs to save)
+was not correctly calculated when the backup targets (files/dirs to save)
 overlap. For example, consider a directory `foo` which contains (among others)
 a file `foo/bar`. When `restic backup foo foo/bar` was run, restic counted the
 size of the file `foo/bar` twice, so the completeness percentage as well as the

changelog/0.16.0_2023-07-31/issue-3941

@@ -1,7 +1,7 @@
 Enhancement: Support `--group-by` for backup parent selection
 
 Previously, the `backup` command by default selected the parent snapshot based
-on the hostname and the backup paths. When the backup path list changed, the
+on the hostname and the backup targets. When the backup path list changed, the
 `backup` command was unable to determine a suitable parent snapshot and had to
 read all files again.
 

changelog/0.16.5_2024-07-01/issue-4873

@@ -1,6 +0,0 @@
-Enhancement: Update dependencies
-
-A few potentially vulnerable dependencies were updated.
-
-https://github.com/restic/restic/issues/4873
-https://github.com/restic/restic/pull/4878

changelog/0.16.5_2024-07-01/pull-4799

@@ -1,5 +0,0 @@
-Enhancement: Add option to force use of Azure CLI credential
-
-A new environment variable `AZURE_FORCE_CLI_CREDENTIAL=true` allows forcing the use of Azure CLI credential, ignoring other credentials like managed identity.
-
-https://github.com/restic/restic/pull/4799

changelog/0.17.0_2024-07-26/issue-1786

@@ -1,20 +0,0 @@
-Enhancement: Support repositories with empty password
-
-Restic previously required a password to create or operate on repositories.
-Using the new option `--insecure-no-password` it is now possible to disable
-this requirement. Restic will not prompt for a password when using this option.
-
-For security reasons, the option must always be specified when operating on
-repositories with an empty password, and specifying `--insecure-no-password`
-while also passing a password to restic via a CLI option or environment
-variable results in an error.
-
-The `init` and `copy` commands add the related `--from-insecure-no-password`
-option, which applies to the source repository. The `key add` and `key passwd`
-commands add the `--new-insecure-no-password` option to add or set an empty
-password.
-
-https://github.com/restic/restic/issues/1786
-https://github.com/restic/restic/issues/4326
-https://github.com/restic/restic/pull/4698
-https://github.com/restic/restic/pull/4808

changelog/0.17.0_2024-07-26/issue-2348

@@ -1,12 +0,0 @@
-Enhancement: Add `--delete` option to `restore` command
-
-The `restore` command now supports a `--delete` option that allows removing
-files and directories from the target directory that do not exist in the
-snapshot. This option also allows files in the snapshot to replace non-empty
-directories having the same name.
-
-To check that only expected files are deleted, add the `--dry-run --verbose=2`
-options.
-
-https://github.com/restic/restic/issues/2348
-https://github.com/restic/restic/pull/4881

changelog/0.17.0_2024-07-26/issue-3600

@@ -1,11 +0,0 @@
-Bugfix: Handle unreadable xattrs in folders above `backup` source
-
-When backup sources are specified using absolute paths, `backup` also includes
-information about the parent folders of the backup sources in the snapshot.
-
-If the extended attributes for some of these folders could not be read due to
-missing permissions, this caused the backup to fail. This has now been fixed.
-
-https://github.com/restic/restic/issues/3600
-https://github.com/restic/restic/pull/4668
-https://forum.restic.net/t/parent-directories-above-the-snapshot-source-path-fatal-error-permission-denied/7216

changelog/0.17.0_2024-07-26/issue-3806

@@ -1,12 +0,0 @@
-Enhancement: Optimize and make `prune` command resumable
-
-Previously, if the `prune` command was interrupted, a later `prune` run would
-start repacking pack files from the start, as `prune` did not update the index
-while repacking.
-
-The `prune` command now supports resuming interrupted prune runs. The update
-of the repository index has also been optimized to use less memory and only
-rewrite parts of the index that have changed.
-
-https://github.com/restic/restic/issues/3806
-https://github.com/restic/restic/pull/4812

changelog/0.17.0_2024-07-26/issue-4048

@@ -1,6 +0,0 @@
-Enhancement: Add support for FUSE-T with `mount` on macOS
-
-The restic `mount` command now supports creating FUSE mounts using FUSE-T on macOS.
-
-https://github.com/restic/restic/issues/4048
-https://github.com/restic/restic/pull/4825

changelog/0.17.0_2024-07-26/issue-4209

@@ -1,7 +0,0 @@
-Bugfix: Fix slow SFTP upload performance
-
-Since restic 0.12.1, the upload speed of the sftp backend to a remote server
-has regressed significantly. This has now been fixed.
-
-https://github.com/restic/restic/issues/4209
-https://github.com/restic/restic/pull/4782

changelog/0.17.0_2024-07-26/issue-4287

@@ -1,12 +0,0 @@
-Enhancement: Support connection to rest-server using unix socket
-
-Restic now supports using a unix socket to connect to a rest-server
-version 0.13.0 or later. This allows running restic as follows:
-
-```
-rest-server --listen unix:/tmp/rest.socket --data /path/to/data &
-restic -r rest:http+unix:///tmp/rest.socket:/my_backup_repo/ [...]
-```
-
-https://github.com/restic/restic/issues/4287
-https://github.com/restic/restic/pull/4655

changelog/0.17.0_2024-07-26/issue-4437

@@ -1,11 +0,0 @@
-Enhancement: Make `check` command create non-existent cache directory
-
-Previously, if a custom cache directory was specified for the `check` command,
-but the directory did not exist, `check` continued with the cache disabled.
-
-The `check` command now attempts to create the cache directory before
-initializing the cache.
-
-https://github.com/restic/restic/issues/4437
-https://github.com/restic/restic/pull/4805
-https://github.com/restic/restic/pull/4883

changelog/0.17.0_2024-07-26/issue-4547

@@ -1,7 +0,0 @@
-Enhancement: Add `--json` option to `version` command
-
-Restic now supports outputting restic version along with the Go version, OS
-and architecture used to build restic in JSON format using `version --json`.
-
-https://github.com/restic/restic/issues/4547
-https://github.com/restic/restic/pull/4553

changelog/0.17.0_2024-07-26/issue-4549

@@ -1,11 +0,0 @@
-Enhancement: Add `--ncdu` option to `ls` command
-
-NCDU (NCurses Disk Usage) is a tool to analyse disk usage of directories. It has
-an option to save a directory tree and analyse it later.
-
-The `ls` command now supports outputting snapshot information in the NCDU format
-using the `--ncdu` option. Example usage: `restic ls latest --ncdu | ncdu -f -`
-
-https://github.com/restic/restic/issues/4549
-https://github.com/restic/restic/pull/4550
-https://github.com/restic/restic/pull/4911

changelog/0.17.0_2024-07-26/issue-4568

@@ -1,16 +0,0 @@
-Bugfix: Prevent `forget --keep-tags <invalid>` from deleting all snapshots
-
-Running `forget --keep-tags <invalid>`, where `<invalid>` is a tag that does
-not exist in the repository, would remove all snapshots. This is especially
-problematic if the tag name contains a typo.
-
-The `forget` command now fails with an error if all snapshots in a snapshot
-group would be deleted. This prevents the above example from deleting all
-snapshots.
-
-It is possible to temporarily disable the new check by setting the environment
-variable `RESTIC_FEATURES=safe-forget-keep-tags=false`. Note that this feature
-flag will be removed in the next minor restic version.
-
-https://github.com/restic/restic/pull/4568
-https://github.com/restic/restic/pull/4764

changelog/0.17.0_2024-07-26/issue-4583

@@ -1,13 +0,0 @@
-Enhancement: Ignore `s3.storage-class` archive tiers for metadata
-
-Restic used to store all files on S3 using the specified `s3.storage-class`.
-
-Now, restic will only use non-archive storage tiers for metadata, to avoid
-problems when accessing a repository. To restore any data, it is still
-necessary to manually warm up the required data beforehand.
-
-NOTE: There is no official cold storage support in restic, use this option at
-your own risk.
-
-https://github.com/restic/restic/issues/4583
-https://github.com/restic/restic/pull/4584

changelog/0.17.0_2024-07-26/issue-4601

@@ -1,9 +0,0 @@
-Enhancement: Add support for feature flags
-
-Restic now supports feature flags that can be used to enable and disable
-experimental features. The flags can be set using the environment variable
-`RESTIC_FEATURES`. To get a list of currently supported feature flags, use
-the `features` command.
-
-https://github.com/restic/restic/issues/4601
-https://github.com/restic/restic/pull/4666

changelog/0.17.0_2024-07-26/issue-4602

@@ -1,22 +0,0 @@
-Change: Deprecate legacy index format and `s3legacy` repository layout
-
-Support for the legacy index format used by restic before version 0.2.0 has
-been deprecated and will be removed in the next minor restic version. You can
-use `restic repair index` to update the index to the current format.
-
-It is possible to temporarily reenable support for the legacy index format by
-setting the environment variable `RESTIC_FEATURES=deprecate-legacy-index=false`.
-Note that this feature flag will be removed in the next minor restic version.
-
-Support for the `s3legacy` repository layout used for the S3 backend before
-restic 0.7.0 has been deprecated and will be removed in the next minor restic
-version. You can migrate your S3 repository to the current layout using
-`RESTIC_FEATURES=deprecate-s3-legacy-layout=false restic migrate s3_layout`.
-
-It is possible to temporarily reenable support for the `s3legacy` layout by
-setting the environment variable `RESTIC_FEATURES=deprecate-s3-legacy-layout=false`.
-Note that this feature flag will be removed in the next minor restic version.
-
-https://github.com/restic/restic/issues/4602
-https://github.com/restic/restic/pull/4724
-https://github.com/restic/restic/pull/4743

changelog/0.17.0_2024-07-26/issue-4627

@@ -1,33 +0,0 @@
-Change: Redesign backend error handling to improve reliability
-
-Restic now downloads pack files in large chunks instead of using a streaming
-download. This prevents failures due to interrupted streams. The `restore`
-command now also retries downloading individual blobs that could not be
-retrieved.
-
-HTTP requests that are stuck for more than two minutes while uploading or
-downloading are now forcibly interrupted. This ensures that stuck requests are
-retried after a short timeout.
-
-Attempts to access a missing or truncated file will no longer be retried. This
-avoids unnecessary retries in those cases. All other backend requests are
-retried for up to 15 minutes. This ensures that temporarily interrupted network
-connections can be tolerated.
-
-If a download yields a corrupt file or blob, then the download will be retried
-once.
-
-Most parts of the new backend error handling can temporarily be disabled by
-setting the environment variable `RESTIC_FEATURES=backend-error-redesign=false`.
-Note that this feature flag will be removed in the next minor restic version.
-
-https://github.com/restic/restic/issues/4627
-https://github.com/restic/restic/issues/4193
-https://github.com/restic/restic/pull/4605
-https://github.com/restic/restic/pull/4792
-https://github.com/restic/restic/issues/4515
-https://github.com/restic/restic/issues/1523
-https://github.com/restic/restic/pull/4520
-https://github.com/restic/restic/pull/4800
-https://github.com/restic/restic/pull/4784
-https://github.com/restic/restic/pull/4844

changelog/0.17.0_2024-07-26/issue-4676

@@ -1,8 +0,0 @@
-Enhancement: Make `key` command's actions separate sub-commands
-
-Each of the `add`, `list`, `remove` and `passwd` actions provided by the `key`
-command is now a separate sub-command and have its own documentation which can
-be invoked using `restic key <add|list|remove|passwd> --help`.
-
-https://github.com/restic/restic/issues/4676
-https://github.com/restic/restic/pull/4685

changelog/0.17.0_2024-07-26/issue-4678

@@ -1,8 +0,0 @@
-Enhancement: Add `--target` option to the `dump` command
-
-Restic `dump` always printed to the standard output. It now supports specifying
-a `--target` file to write its output to.
-
-https://github.com/restic/restic/issues/4678
-https://github.com/restic/restic/pull/4682
-https://github.com/restic/restic/pull/4692

changelog/0.17.0_2024-07-26/issue-4707

@@ -1,14 +0,0 @@
-Change: Disable S3 anonymous authentication by default
-
-When using the S3 backend with anonymous authentication, it continuously
-tried to retrieve new authentication credentials, causing bad performance.
-
-Now, to use anonymous authentication, it is necessary to pass the extended
-option `-o s3.unsafe-anonymous-auth=true` to restic.
-
-It is possible to temporarily revert to the old behavior by setting the
-environment variable `RESTIC_FEATURES=explicit-s3-anonymous-auth=false`. Note
-that this feature flag will be removed in the next minor restic version.
-
-https://github.com/restic/restic/issues/4707
-https://github.com/restic/restic/pull/4908

changelog/0.17.0_2024-07-26/issue-4733

@@ -1,12 +0,0 @@
-Enhancement: Allow specifying `--host` via environment variable
-
-Restic commands that operate on snapshots, such as `restic backup` and
-`restic snapshots`, support the `--host` option to specify the hostname
-for grouping snapshots.
-
-Such commands now also support specifying the hostname via the environment
-variable `RESTIC_HOST`. Note that `--host` still takes precedence over the
-environment variable.
-
-https://github.com/restic/restic/issues/4733
-https://github.com/restic/restic/pull/4734

changelog/0.17.0_2024-07-26/issue-4744

@@ -1,9 +0,0 @@
-Change: Include full key ID in JSON output of `key list`
-
-The JSON output of the `key list` command has changed to include the full key
-ID instead of just a shortened version of the ID, as the latter can be ambiguous
-in some rare cases. To derive the short ID, please truncate the full ID down to
-eight characters.
-
-https://github.com/restic/restic/issues/4744
-https://github.com/restic/restic/pull/4745

changelog/0.17.0_2024-07-26/issue-4760

@@ -1,8 +0,0 @@
-Bugfix: Fix possible error on concurrent cache cleanup
-
-If multiple restic processes concurrently cleaned up no longer existing files
-from the cache, this could cause some of the processes to fail with an `no such
-file or directory` error. This has now been fixed.
-
-https://github.com/restic/restic/issues/4760
-https://github.com/restic/restic/pull/4761

changelog/0.17.0_2024-07-26/issue-4768

@@ -1,8 +0,0 @@
-Enhancement: Allow specifying custom User-Agent for outgoing requests
-
-Restic now supports setting a custom `User-Agent` for outgoing HTTP requests
-using the global option `--http-user-agent` or the `RESTIC_HTTP_USER_AGENT`
-environment variable.
-
-https://github.com/restic/restic/issues/4768
-https://github.com/restic/restic/pull/4810

changelog/0.17.0_2024-07-26/issue-4781

@@ -1,8 +0,0 @@
-Enhancement: Add `restore` options to read include/exclude patterns from files
-
-Restic now supports reading include and exclude patterns from files using the 
-`--include-file`, `--exclude-file`, `--iinclude-file` and `--iexclude-file` 
-options of the `restore` command.
-
-https://github.com/restic/restic/issues/4781
-https://github.com/restic/restic/pull/4811

changelog/0.17.0_2024-07-26/issue-4817

@@ -1,26 +0,0 @@
-Enhancement: Make overwrite behavior of `restore` customizable
-
-The `restore` command now supports an `--overwrite` option to configure whether
-already existing files are overwritten. The overwrite behavior can be configured
-using the following option values:
-
-- `--overwrite always` (default): Always overwrites already existing files.
-  The `restore` command will verify the existing file content and only restore
-  mismatching parts to minimize downloads. Updates the metadata of all files.
-- `--overwrite if-changed`: Like `always`, but speeds up the file content check
-  by assuming that files with matching size and modification time (mtime) are
-  already up to date. In case of a mismatch, the full file content is verified
-  like with `always`. Updates the metadata of all files.
-- `--overwrite if-newer`: Like `always`, but only overwrites existing files
-  when the file in the snapshot has a newer modification time (mtime) than the
-  existing file.
-- `--overwrite never`: Never overwrites existing files.
-
-https://github.com/restic/restic/issues/4817
-https://github.com/restic/restic/issues/200
-https://github.com/restic/restic/issues/407
-https://github.com/restic/restic/issues/2662
-https://github.com/restic/restic/pull/4837
-https://github.com/restic/restic/pull/4838
-https://github.com/restic/restic/pull/4864
-https://github.com/restic/restic/pull/4921

changelog/0.17.0_2024-07-26/issue-4850

@@ -1,8 +0,0 @@
-Bugfix: Handle UTF-16 password files in `key` command correctly
-
-Previously, `key add` and `key passwd` did not properly decode UTF-16
-encoded passwords read from a password file. This has now been fixed
-to correctly match the encoding when opening a repository.
-
-https://github.com/restic/restic/issues/4850
-https://github.com/restic/restic/pull/4851

changelog/0.17.0_2024-07-26/issue-4902

@@ -1,8 +0,0 @@
-Bugfix: Update snapshot summary on `rewrite`
-
-Restic previously did not recalculate the total number of files and bytes
-processed when files were excluded from a snapshot by the `rewrite` command.
-This has now been fixed.
-
-https://github.com/restic/restic/issues/4902
-https://github.com/restic/restic/pull/4905

changelog/0.17.0_2024-07-26/issue-662

@@ -1,11 +0,0 @@
-Enhancement: Optionally skip snapshot creation if nothing changed
-
-The `backup` command always created a snapshot even if nothing in the
-backup set changed compared to the parent snapshot.
-
-Restic now supports the `--skip-if-unchanged` option for the `backup`
-command, which omits creating a snapshot if the new snapshot's content
-would be identical to that of the parent snapshot.
-
-https://github.com/restic/restic/issues/662
-https://github.com/restic/restic/pull/4816

changelog/0.17.0_2024-07-26/issue-693

@@ -1,13 +0,0 @@
-Enhancement: Include snapshot size in `snapshots` output
-
-The `snapshots` command now prints the size for snapshots created using this
-or a future restic version. To achieve this, the `backup` command now stores
-the backup summary statistics in the snapshot.
-
-The text output of the `snapshots` command only shows the snapshot size. The
-other statistics are only included in the JSON output. To inspect these
-statistics use `restic snapshots --json` or `restic cat snapshot <snapshotID>`.
-
-https://github.com/restic/restic/issues/693
-https://github.com/restic/restic/pull/4705
-https://github.com/restic/restic/pull/4913

changelog/0.17.0_2024-07-26/issue-828

@@ -1,11 +0,0 @@
-Enhancement: Improve features of the `repair packs` command
-
-The `repair packs` command has been improved to also be able to process
-truncated pack files. The `check` and `check --read-data` command will provide
-instructions on using the command if necessary to repair a repository. See the
-guide at https://restic.readthedocs.io/en/stable/077_troubleshooting.html for
-further instructions.
-
-https://github.com/restic/restic/issues/828
-https://github.com/restic/restic/pull/4644
-https://github.com/restic/restic/pull/4882

changelog/0.17.0_2024-07-26/pull-3067

@@ -1,25 +0,0 @@
-Enhancement: Add extended options to configure Windows Shadow Copy Service
-
-Previous, restic always used a 120 seconds timeout and unconditionally created
-VSS snapshots for all volume mount points on disk. This behavior can now be
-fine-tuned by the following new extended options (available only on Windows):
-
-- `-o vss.timeout`: Time that VSS can spend creating snapshot before timing out (default: 120s)
-- `-o vss.exclude-all-mount-points`: Exclude mountpoints from snapshotting on all volumes (default: false)
-- `-o vss.exclude-volumes`: Semicolon separated list of volumes to exclude from snapshotting
-- `-o vss.provider`: VSS provider identifier which will be used for snapshotting
-
-For example, change VSS timeout to five minutes and disable snapshotting of
-mount points on all volumes:
-
-    restic backup --use-fs-snapshot -o vss.timeout=5m -o vss.exclude-all-mount-points=true
-
-Exclude drive `d:`, mount point `c:\mnt` and a specific volume from snapshotting:
-
-    restic backup --use-fs-snapshot -o vss.exclude-volumes="d:\;c:\mnt\;\\?\Volume{e2e0315d-9066-4f97-8343-eb5659b35762}"
-
-Uses 'Microsoft Software Shadow Copy provider 1.0' instead of the default provider:
-
-    restic backup --use-fs-snapshot -o vss.provider={b5946137-7b9f-4925-af80-51abd60b20d5}
-
-https://github.com/restic/restic/pull/3067

changelog/0.17.0_2024-07-26/pull-4006

@@ -1,15 +0,0 @@
-Enhancement: (alpha) Store deviceID only for hardlinks
-
-Set `RESTIC_FEATURES=device-id-for-hardlinks` to enable this alpha feature.
-The feature flag will be removed after repository format version 3 becomes
-available or be replaced with a different solution.
-
-When creating backups from a filesystem snapshot, for example created using
-BTRFS subvolumes, the deviceID of the filesystem changes compared to previous
-snapshots. This prevented restic from deduplicating the directory metadata of
-a snapshot.
-
-When this alpha feature is enabled, the deviceID is only stored for hardlinks,
-which significantly reduces the metadata duplication for most backups.
-
-https://github.com/restic/restic/pull/4006

changelog/0.17.0_2024-07-26/pull-4354

@@ -1,7 +0,0 @@
-Enhancement: Significantly reduce `prune` memory usage
-
-The `prune` command has been optimized to use up to 60% less memory.
-The memory usage should now be roughly similar to creating a backup.
-
-https://github.com/restic/restic/pull/4354
-https://github.com/restic/restic/pull/4812

changelog/0.17.0_2024-07-26/pull-4503

@@ -1,8 +0,0 @@
-Bugfix: Correct hardlink handling in `stats` command
-
-If files on different devices had the same inode ID, the `stats` command
-did not correctly calculate the snapshot size. This has now been fixed.
-
-https://forum.restic.net/t/possible-bug-in-stats/6461/8
-https://github.com/restic/restic/pull/4503
-https://github.com/restic/restic/pull/4006

changelog/0.17.0_2024-07-26/pull-4526

@@ -1,12 +0,0 @@
-Enhancement: Add bitrot detection to `diff` command
-
-The output of the `diff` command now includes the modifier `?` for files to
-indicate bitrot in backed up files. The `?` will appear whenever there is a
-difference in content while the metadata is exactly the same.
-
-Since files with unchanged metadata are normally not read again when creating
-a backup, the detection is only effective when the right-hand side of the diff
-has been created with `backup --force`.
-
-https://github.com/restic/restic/issues/805
-https://github.com/restic/restic/pull/4526

changelog/0.17.0_2024-07-26/pull-4573

@@ -1,6 +0,0 @@
-Enhancement: Support rewriting host and time metadata in snapshots
-
-The `rewrite` command now supports rewriting the host and/or time metadata of
-a snapshot using the new `--new-host` and `--new-time` options.
-
-https://github.com/restic/restic/pull/4573

changelog/0.17.0_2024-07-26/pull-4590

@@ -1,6 +0,0 @@
-Enhancement: Speed up `mount` command's error detection
-
-The `mount` command now checks for the existence of the mountpoint before
-opening the repository, leading to quicker error detection.
-
-https://github.com/restic/restic/pull/4590

changelog/0.17.0_2024-07-26/pull-4611

@@ -1,9 +0,0 @@
-Enhancement: Back up more file metadata on Windows
-
-Previously, restic did not back up all common Windows-specific metadata.
-
-Restic now stores file creation time and file attributes like the hidden,
-read-only and encrypted flags when backing up files and folders on Windows.
-
-https://github.com/restic/restic/pull/4611
-

changelog/0.17.0_2024-07-26/pull-4664

@@ -1,10 +0,0 @@
-Enhancement: Make `ls` use `message_type` field in JSON output
-
-The `ls` command was the only restic command that used the `struct_type` field
-in its JSON output format to specify the message type.
-
-The JSON output of the `ls` command now also includes the `message_type` field,
-which is consistent with other commands. The `struct_type` field is still
-included, but now deprecated.
-
-https://github.com/restic/restic/pull/4664

changelog/0.17.0_2024-07-26/pull-4703

@@ -1,11 +0,0 @@
-Bugfix: Shutdown cleanly when receiving SIGTERM
-
-Previously, when restic received the SIGTERM signal it would terminate
-immediately, skipping cleanup and potentially causing issues like stale locks
-being left behind. This primarily effected containerized restic invocations
-that use SIGTERM, but could also be triggered via a simple `killall restic`.
-
-This has now been fixed, such that restic shuts down cleanly when receiving
-the SIGTERM signal.
-
-https://github.com/restic/restic/pull/4703

changelog/0.17.0_2024-07-26/pull-4708

@@ -1,13 +0,0 @@
-Enhancement: Back up and restore SecurityDescriptors on Windows
-
-Restic now backs up and restores SecurityDescriptors for files and folders on
-Windows which includes owner, group, discretionary access control list (DACL)
-and system access control list (SACL).
-
-This requires the user to be a member of backup operators or the application
-must be run as admin. If that is not the case, only the current user's owner,
-group and DACL will be backed up, and during restore only the DACL of the
-backed up file will be restored, with the current user's owner and group
-being set on the restored file.
-
-https://github.com/restic/restic/pull/4708

changelog/0.17.0_2024-07-26/pull-4709

@@ -1,10 +0,0 @@
-Bugfix: Correct `--no-lock` handling of `ls` and `tag` commands
-
-The `ls` command never locked the repository. This has now been fixed, with the
-old behavior still being supported using `ls --no-lock`. The latter invocation
-also works with older restic versions.
-
-The `tag` command erroneously accepted the `--no-lock` command. This command
-now always requires an exclusive lock.
-
-https://github.com/restic/restic/pull/4709

changelog/0.17.0_2024-07-26/pull-4737

@@ -1,6 +0,0 @@
-Enhancement: Include snapshot ID in `reason` field of `forget` JSON output
-
-The JSON output of the `forget` command now includes `id` and `short_id` of
-snapshots in the `reason` field.
-
-https://github.com/restic/restic/pull/4737

changelog/0.17.0_2024-07-26/pull-4764

@@ -1,10 +0,0 @@
-Enhancement: Support forgetting all snapshots
-
-The `forget` command now supports the `--unsafe-allow-remove-all` option, which
-removes all snapshots in the repository.
-
-This option must always be combined with a snapshot filter (by host, path or
-tag). For example, the command `forget --tag example --unsafe-allow-remove-all`
-removes all snapshots with the tag "example".
-
-https://github.com/restic/restic/pull/4764

changelog/0.17.0_2024-07-26/pull-4796

@@ -1,8 +0,0 @@
-Enhancement: Improve `dump` performance for large files
-
-The `dump` command now retrieves the data chunks for a file in
-parallel. This improves the download performance by up to as many
-times as the configured number of parallel backend connections.
-
-https://github.com/restic/restic/issues/3406
-https://github.com/restic/restic/pull/4796

changelog/0.17.0_2024-07-26/pull-4807

@@ -1,6 +0,0 @@
-Enhancement: Support Extended Attributes on Windows NTFS
-
-Restic now backs up and restores Extended Attributes for files
-and folders on Windows NTFS.
-
-https://github.com/restic/restic/pull/4807

changelog/0.17.0_2024-07-26/pull-4839

@@ -1,7 +0,0 @@
-Enhancement: Add dry-run support to `restore` command
-
-The `restore` command now supports the `--dry-run` option to perform
-a dry run. Pass the `--verbose=2` option to see which files would
-remain unchanged, and which would be updated or freshly restored.
-
-https://github.com/restic/restic/pull/4839

changelog/0.17.0_2024-07-26/pull-4884

@@ -1,11 +0,0 @@
-Change: Return exit code 10 and 11 for non-existing and locked repository
-
-If a repository does not exist or cannot be locked, restic previously always
-returned exit code 1. This made it difficult to distinguish these cases from
-other errors.
-
-Restic now returns exit code 10 if the repository does not exist, and exit code
-11 if the repository could be not locked due to a conflicting lock.
-
-https://github.com/restic/restic/issues/956
-https://github.com/restic/restic/pull/4884

changelog/0.17.1_2024-09-05/issue-2004

@@ -1,18 +0,0 @@
-Bugfix: Correctly handle volume names in `backup` command on Windows
-
-On Windows, when the specified backup target only included the volume
-name without a trailing slash, for example, `C:`, then restoring the
-resulting snapshot would result in an error. Note that using `C:\`
-as backup target worked correctly.
-
-Specifying volume names is now handled correctly. To restore snapshots
-created before this bugfix, use the <snapshot>:<subpath> syntax. For
-example, to restore a snapshot with ID `12345678` that backed up `C:`,
-use the following command:
-
-```
-restic restore 12345678:/C/C:./ --target output/folder
-```
-
-https://github.com/restic/restic/issues/2004
-https://github.com/restic/restic/pull/5028

changelog/0.17.1_2024-09-05/issue-4795

@@ -1,8 +0,0 @@
-Enhancement: Display progress bar for `restore --verify`
-
-When the `restore` command is run with `--verify`, it now displays a progress
-bar while the verification step is running. The progress bar is not shown when
-the `--json` flag is specified.
-
-https://github.com/restic/restic/issues/4795
-https://github.com/restic/restic/pull/4989

changelog/0.17.1_2024-09-05/issue-4934

@@ -1,11 +0,0 @@
-Enhancement: Automatically clear removed snapshots from cache
-
-Previously, restic only removed snapshots from the cache on the host where the
-`forget` command was executed. On other hosts that use the same repository, the
-old snapshots remained in the cache.
-
-Restic now automatically clears old snapshots from the local cache of the
-current host.
-
-https://github.com/restic/restic/issues/4934
-https://github.com/restic/restic/pull/4981

changelog/0.17.1_2024-09-05/issue-4944

@@ -1,9 +0,0 @@
-Enhancement: Print JSON-formatted errors during `restore --json`
-
-Restic used to print any `restore` errors directly to the console as freeform
-text messages, even when using the `--json` option.
-
-Now, when `--json` is specified, restic prints them as JSON formatted messages.
-
-https://github.com/restic/restic/issues/4944
-https://github.com/restic/restic/pull/4946

changelog/0.17.1_2024-09-05/issue-4945

@@ -1,10 +0,0 @@
-Bugfix: Include missing backup error text with `--json`
-
-Previously, when running a backup with the `--json` option, restic failed to
-include the actual error message in the output, resulting in `"error": {}`
-being displayed.
-
-This has now been fixed, and restic now includes the error text in JSON output.
-
-https://github.com/restic/restic/issues/4945
-https://github.com/restic/restic/pull/4946

changelog/0.17.1_2024-09-05/issue-4953

@@ -1,7 +0,0 @@
-Bugfix: Correctly handle long paths on older Windows versions
-
-On older Windows versions, like Windows Server 2012, restic 0.17.0 failed to
-back up files with long paths. This problem has now been resolved.
-
-https://github.com/restic/restic/issues/4953
-https://github.com/restic/restic/pull/4954

changelog/0.17.1_2024-09-05/issue-4957

@@ -1,8 +0,0 @@
-Bugfix: Fix delayed cancellation of certain commands
-
-Since restic 0.17.0, some commands did not immediately respond to cancellation
-via Ctrl-C (SIGINT) and continued running for a short period. The most affected
-commands were `diff`,`find`, `ls`, `stats` and `rewrite`. This is now resolved.
-
-https://github.com/restic/restic/issues/4957
-https://github.com/restic/restic/pull/4960

changelog/0.17.1_2024-09-05/issue-4969

@@ -1,7 +0,0 @@
-Bugfix: Correctly restore timestamp for files with resource forks on macOS
-
-On macOS, timestamps were not restored for files with resource forks. This has
-now been fixed.
-
-https://github.com/restic/restic/issues/4969
-https://github.com/restic/restic/pull/5006

changelog/0.17.1_2024-09-05/issue-4970

@@ -1,15 +0,0 @@
-Enhancement: Make timeout for stuck requests customizable
-
-Restic monitors connections to the backend to detect stuck requests. If a
-request does not return any data within five minutes, restic assumes the
-request is stuck and retries it. However, for large repositories this timeout
-might be insufficient to collect a list of all files, causing the following
-error:
-
-`List(data) returned error, retrying after 1s: [...]: request timeout`
-
-It is now possible to increase the timeout using the `--stuck-request-timeout`
-option.
-
-https://github.com/restic/restic/issues/4970
-https://github.com/restic/restic/pull/5014

changelog/0.17.1_2024-09-05/issue-4975

@@ -1,7 +0,0 @@
-Bugfix: Prevent `backup --stdin-from-command` from panicking
-
-Restic would previously crash if `--stdin-from-command` was specified without
-providing a command. This issue has now been fixed.
-
-https://github.com/restic/restic/issues/4975
-https://github.com/restic/restic/pull/4976

changelog/0.17.1_2024-09-05/issue-5004

@@ -1,12 +0,0 @@
-Bugfix: Fix spurious "A Required Privilege Is Not Held by the Client" error
-
-On Windows, creating a backup could sometimes trigger the following error:
-
-```
-error: nodeFromFileInfo [...]: get named security info failed with: a required privilege is not held by the client.
-```
-
-This has now been fixed.
-
-https://github.com/restic/restic/issues/5004
-https://github.com/restic/restic/pull/5019

changelog/0.17.1_2024-09-05/issue-5005

@@ -1,16 +0,0 @@
-Bugfix: Fix rare failures to retry locking a repository
-
-Restic 0.17.0 could in rare cases fail to retry locking a repository if one of
-the lock files failed to load, resulting in the error:
-
-```
-unable to create lock in backend: circuit breaker open for file <lock/1234567890>
-```
-
-This issue has now been addressed. The error handling now properly retries the
-locking operation. In addition, restic waits a few seconds between locking
-retries to increase chances of successful locking.
-
-https://github.com/restic/restic/issues/5005
-https://github.com/restic/restic/pull/5011
-https://github.com/restic/restic/pull/5012

changelog/0.17.1_2024-09-05/pull-4958

@@ -1,7 +0,0 @@
-Bugfix: Don't ignore metadata-setting errors during restore
-
-Previously, restic used to ignore errors when setting timestamps, attributes,
-or file modes during a restore. It now reports those errors, except for
-permission related errors when running without root privileges.
-
-https://github.com/restic/restic/pull/4958

changelog/0.17.1_2024-09-05/pull-4959

@@ -1,6 +0,0 @@
-Enhancement: Return exit code 12 for "bad password" errors
-
-Restic now returns exit code 12 when it cannot open the repository due to an
-incorrect password.
-
-https://github.com/restic/restic/pull/4959

changelog/0.17.1_2024-09-05/pull-4977

@@ -1,16 +0,0 @@
-Change: Also back up files with incomplete metadata
-
-If restic failed to read extended metadata for a file or folder during a
-backup, then the file or folder was not included in the resulting snapshot.
-Instead, a warning message was printed along with returning exit code 3 once
-the backup was finished.
-
-Now, restic also includes items for which the extended metadata could not be
-read in a snapshot. The warning message has been updated to:
-
-```
-incomplete metadata for /path/to/file: <details about error>
-```
-
-https://github.com/restic/restic/issues/4953
-https://github.com/restic/restic/pull/4977

changelog/0.17.1_2024-09-05/pull-4980

@@ -1,12 +0,0 @@
-Bugfix: Skip extended attribute processing on unsupported Windows volumes
-
-With restic 0.17.0, backups of certain Windows paths, such as network drives,
-failed due to errors while fetching extended attributes.
-
-Restic now skips extended attribute processing for volumes where they are not
-supported.
-
-https://github.com/restic/restic/pull/4980
-https://github.com/restic/restic/pull/4998
-https://github.com/restic/restic/issues/4955
-https://github.com/restic/restic/issues/4950

changelog/0.17.1_2024-09-05/pull-5018

@@ -1,13 +0,0 @@
-Bugfix: Improve HTTP/2 support for REST backend
-
-If `rest-server` tried to gracefully shut down an HTTP/2 connection still in
-use by the client, it could result in the following error:
-
-```
-http2: Transport: cannot retry err [http2: Transport received Server's graceful shutdown GOAWAY] after Request.Body was written; define Request.GetBody to avoid this error
-```
-
-This issue has now been resolved.
-
-https://github.com/restic/restic/pull/5018
-https://forum.restic.net/t/receiving-http2-goaway-messages-with-windows-restic-v0-17-0/8367

changelog/0.17.2_2024-10-27/issue-4004

@@ -1,12 +0,0 @@
-Bugfix: Support container-level SAS/SAT tokens for Azure backend
-
-Restic previously expected SAS/SAT tokens to be generated at the account level,
-which prevented tokens created at the container level from being used to
-initialize a repository. This caused an error when attempting to initialize a
-repository with container-level tokens.
-
-Restic now supports both account-level and container-level SAS/SAT tokens for
-initializing a repository.
-
-https://github.com/restic/restic/issues/4004
-https://github.com/restic/restic/pull/5093

changelog/0.17.2_2024-10-27/issue-5050

@@ -1,7 +0,0 @@
-Bugfix: Return error if `tag` fails to lock repository
-
-Since restic 0.17.0, the `tag` command did not return an error when it failed
-to open or lock the repository. This issue has now been fixed.
-
-https://github.com/restic/restic/issues/5050
-https://github.com/restic/restic/pull/5056

changelog/0.17.2_2024-10-27/issue-5063

@@ -1,12 +0,0 @@
-Bugfix: Correctly `backup` extended metadata when using VSS on Windows
-
-On Windows, when creating a backup with the `--use-fs-snapshot` option, restic
-read extended metadata from the original filesystem path instead of from the
-snapshot. This could result in errors if files were removed during the backup
-process.
-
-This issue has now been resolved.
-
-https://github.com/restic/restic/issues/5063
-https://github.com/restic/restic/pull/5097
-https://github.com/restic/restic/pull/5099

changelog/0.17.2_2024-10-27/pull-5047

@@ -1,8 +0,0 @@
-Bugfix: Resolve potential error during concurrent cache cleanup
-
-When multiple restic processes ran concurrently, they could compete to remove
-obsolete snapshots from the local backend cache, sometimes leading to a "no
-such file or directory" error. Restic now suppresses this error to prevent
-issues during cache cleanup.
-
-https://github.com/restic/restic/pull/5047

changelog/0.17.2_2024-10-27/pull-5057

@@ -1,24 +0,0 @@
-Bugfix: Exclude irregular files from backups
-
-Since restic 0.17.1, files with the type `irregular` could mistakenly be included
-in snapshots, especially when backing up special file types on Windows that
-restic cannot process. This issue has now been fixed.
-
-Previously, this bug caused the `check` command to report errors like the
-following one:
-
-```
-  tree 12345678[...]: node "example.zip" with invalid type "irregular"
-```
-
-To repair affected snapshots, upgrade to restic 0.17.2 and run:
-
-```
-restic repair snapshots --forget
-```
-
-This will remove the `irregular` files from the snapshots (creating
-a new snapshot ID for each of the affected snapshots).
-
-https://github.com/restic/restic/pull/5057
-https://forum.restic.net/t/errors-found-by-check-1-invalid-type-irregular-2-ciphertext-verification-failed/8447/2

changelog/changelog-github.tmpl

@@ -15,7 +15,7 @@ Details
 {{ range $entry := .Entries }}{{ with $entry }}
  * {{ .Type }} #{{ .PrimaryID }}: {{ .Title }}
 {{ range $par := .Paragraphs }}
-{{ indent 3 $par }}
+   {{ $par }}
 {{ end }}
    {{ range $id := .Issues -}}
 {{ ` ` }}[#{{ $id }}](https://github.com/restic/restic/issues/{{ $id -}})

changelog/unreleased/issue-4251

@@ -1,4 +1,4 @@
-Enhancement: Support reading backup from a command's standard output
+Enhancement: Support reading backup from a commands's standard output
 
 The `backup` command now supports the `--stdin-from-command` option. When using
 this option, the arguments to `backup` are interpreted as a command instead of

changelog/unreleased/issue-4472

@@ -1,11 +1,11 @@
-Enhancement: Support AWS Assume Role for S3 backend
+Enhancement: Allow AWS Assume Role to be used for S3 backend
 
 Previously only credentials discovered via the Minio discovery methods
 were used to authenticate.
 
 However, there are many circumstances where the discovered credentials have
 lower permissions and need to assume a specific role. This is now possible
-using the following new environment variables:
+using the following new environment variables.
 
 - RESTIC_AWS_ASSUME_ROLE_ARN
 - RESTIC_AWS_ASSUME_ROLE_SESSION_NAME

changelog/unreleased/issue-4515

@@ -0,0 +1,8 @@
+Change: Don't retry to load files that don't exist
+
+Restic used to always retry to load files. It now only retries to load
+files if they exist.
+
+https://github.com/restic/restic/issues/4515
+https://github.com/restic/restic/issues/1523
+https://github.com/restic/restic/pull/4520

changelog/unreleased/issue-4540

@@ -1,7 +1,6 @@
 Change: Require at least ARMv6 for ARM binaries
 
-The official release binaries of restic now require
-at least ARMv6 support for ARM platforms.
+The official release binaries of restic now require at least ARMv6 support for ARM platforms.
 
 https://github.com/restic/restic/issues/4540
 https://github.com/restic/restic/pull/4542

changelog/unreleased/issue-4547

@@ -0,0 +1,7 @@
+Enhancement: Add support for `--json` option to `version` command
+
+Restic now supports outputting restic version and used go version, OS and
+architecture via JSON when using the version command.
+
+https://github.com/restic/restic/issues/4547
+https://github.com/restic/restic/pull/4553

changelog/unreleased/issue-4549

@@ -0,0 +1,11 @@
+Enhancement: Add `--ncdu` option to `ls` command
+
+NCDU (NCurses Disk Usage) is a tool to analyse disk usage of directories.
+It has an option to save a directory tree and analyse it later.
+The `ls` command now supports the `--ncdu` option which outputs information
+about a snapshot in the NCDU format.
+
+You can use it as follows: `restic ls latest --ncdu | ncdu -f -`
+
+https://github.com/restic/restic/issues/4549
+https://github.com/restic/restic/pull/4550

changelog/unreleased/issue-4583

@@ -0,0 +1,12 @@
+Enhancement: Ignore s3.storage-class for metadata if archive tier is specified
+
+There is no official cold storage support in restic, use this option at your
+own risk.
+
+Restic always stored all files on s3 using the specified `s3.storage-class`.
+Now, restic will store metadata using a non-archive storage tier to avoid
+problems when accessing a repository. To restore any data, it is still
+necessary to manually warm up the required data beforehand.
+
+https://github.com/restic/restic/issues/4583
+https://github.com/restic/restic/pull/4584

changelog/unreleased/issue-4656

@@ -1,6 +1,6 @@
-Bugfix: Properly report ID of newly added keys
+Bugfix: Properly report the ID of newly added keys
 
-`restic key add` now reports the ID of the newly added key. This simplifies
+`restic key add` now reports the ID of a newly added key. This simplifies
 selecting a specific key using the `--key-hint key` option.
 
 https://github.com/restic/restic/issues/4656

changelog/unreleased/issue-4676

@@ -0,0 +1,8 @@
+Enhancement: Move key add, list, remove and passwd as separate sub-commands
+
+Restic now provides usage documentation for the `key` command. Each sub-command;
+`add`, `list`, `remove` and `passwd` now have their own sub-command documentation
+which can be invoked using `restic key <add|list|remove|passwd> --help`.
+
+https://github.com/restic/restic/issues/4676
+https://github.com/restic/restic/pull/4685

changelog/unreleased/issue-4678

@@ -0,0 +1,8 @@
+Enhancement: Add --target flag to the dump command
+
+Restic `dump` always printed to the standard output. It now permits to select a
+`--target` file to write the output to.
+
+https://github.com/restic/restic/issues/4678
+https://github.com/restic/restic/pull/4682
+https://github.com/restic/restic/pull/4692

changelog/unreleased/pull-4503

@@ -0,0 +1,7 @@
+Bugfix: Correct hardlink handling in `stats` command
+
+If files on different devices had the same inode id, then the `stats` command
+did not correctly calculate the snapshot size. This has been fixed.
+
+https://github.com/restic/restic/pull/4503
+https://forum.restic.net/t/possible-bug-in-stats/6461/8

changelog/unreleased/pull-4526

@@ -0,0 +1,11 @@
+Enhancement: Add bitrot detection to `diff` command
+
+The output of the `diff` command now includes the modifier `?` for files
+to indicate bitrot in backed up files. It will appear whenever there is a
+difference in content while the metadata is exactly the same. Since files with
+unchanged metadata are normally not read again when creating a backup, the
+detection is only effective if the right-hand side of the diff has been created
+with "backup --force".
+
+https://github.com/restic/restic/issues/805
+https://github.com/restic/restic/pull/4526

changelog/unreleased/pull-4573

@@ -0,0 +1,5 @@
+Enhancement: Add `--new-host` and `--new-time` options to `rewrite` command
+
+`restic rewrite` now allows rewriting the host and / or time metadata of a snapshot.
+
+https://github.com/restic/restic/pull/4573

changelog/unreleased/pull-4590

@@ -0,0 +1,7 @@
+Enhancement: `mount` tests mountpoint existence before opening the repository
+
+The restic `mount` command now checks for the existence of the
+mountpoint before opening the repository, leading to quicker error
+detection.
+
+https://github.com/restic/restic/pull/4590

changelog/unreleased/pull-4615

@@ -1,6 +1,6 @@
-Bugfix: Make `find` not sometimes ignore directories
+Bugfix: `find` ignored directories in some cases
 
 In some cases, the `find` command ignored empty or moved directories. This has
-now been fixed.
+been fixed.
 
 https://github.com/restic/restic/pull/4615

changelog/unreleased/pull-4644

@@ -0,0 +1,10 @@
+Enhancement: Improve `repair packs` command
+
+The `repair packs` command has been improved to also be able to process
+truncated pack files. The `check --read-data` command will provide instructions
+on using the command if necessary to repair a repository. See the guide at
+https://restic.readthedocs.io/en/stable/077_troubleshooting.html for further
+instructions.
+
+https://github.com/restic/restic/pull/4644
+https://github.com/restic/restic/pull/4655

cmd/restic/cleanup.go

@@ -1,41 +1,89 @@
 package main
 
 import (
-	"context"
 	"os"
 	"os/signal"
+	"sync"
 	"syscall"
 
 	"github.com/restic/restic/internal/debug"
 )
 
-func createGlobalContext() context.Context {
-	ctx, cancel := context.WithCancel(context.Background())
-
-	ch := make(chan os.Signal, 1)
-	go cleanupHandler(ch, cancel)
-	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
-
-	return ctx
+var cleanupHandlers struct {
+	sync.Mutex
+	list []func(code int) (int, error)
+	done bool
+	ch   chan os.Signal
 }
 
-// cleanupHandler handles the SIGINT and SIGTERM signals.
-func cleanupHandler(c <-chan os.Signal, cancel context.CancelFunc) {
-	s := <-c
-	debug.Log("signal %v received, cleaning up", s)
-	Warnf("%ssignal %v received, cleaning up\n", clearLine(0), s)
+func init() {
+	cleanupHandlers.ch = make(chan os.Signal, 1)
+	go CleanupHandler(cleanupHandlers.ch)
+	signal.Notify(cleanupHandlers.ch, syscall.SIGINT)
+}
 
-	if val, _ := os.LookupEnv("RESTIC_DEBUG_STACKTRACE_SIGINT"); val != "" {
-		_, _ = os.Stderr.WriteString("\n--- STACKTRACE START ---\n\n")
-		_, _ = os.Stderr.WriteString(debug.DumpStacktrace())
-		_, _ = os.Stderr.WriteString("\n--- STACKTRACE END ---\n")
+// AddCleanupHandler adds the function f to the list of cleanup handlers so
+// that it is executed when all the cleanup handlers are run, e.g. when SIGINT
+// is received.
+func AddCleanupHandler(f func(code int) (int, error)) {
+	cleanupHandlers.Lock()
+	defer cleanupHandlers.Unlock()
+
+	// reset the done flag for integration tests
+	cleanupHandlers.done = false
+
+	cleanupHandlers.list = append(cleanupHandlers.list, f)
+}
+
+// RunCleanupHandlers runs all registered cleanup handlers
+func RunCleanupHandlers(code int) int {
+	cleanupHandlers.Lock()
+	defer cleanupHandlers.Unlock()
+
+	if cleanupHandlers.done {
+		return code
 	}
+	cleanupHandlers.done = true
 
-	cancel()
+	for _, f := range cleanupHandlers.list {
+		var err error
+		code, err = f(code)
+		if err != nil {
+			Warnf("error in cleanup handler: %v\n", err)
+		}
+	}
+	cleanupHandlers.list = nil
+	return code
 }
 
-// Exit terminates the process with the given exit code.
+// CleanupHandler handles the SIGINT signals.
+func CleanupHandler(c <-chan os.Signal) {
+	for s := range c {
+		debug.Log("signal %v received, cleaning up", s)
+		Warnf("%ssignal %v received, cleaning up\n", clearLine(0), s)
+
+		if val, _ := os.LookupEnv("RESTIC_DEBUG_STACKTRACE_SIGINT"); val != "" {
+			_, _ = os.Stderr.WriteString("\n--- STACKTRACE START ---\n\n")
+			_, _ = os.Stderr.WriteString(debug.DumpStacktrace())
+			_, _ = os.Stderr.WriteString("\n--- STACKTRACE END ---\n")
+		}
+
+		code := 0
+
+		if s == syscall.SIGINT {
+			code = 130
+		} else {
+			code = 1
+		}
+
+		Exit(code)
+	}
+}
+
+// Exit runs the cleanup handlers and then terminates the process with the
+// given exit code.
 func Exit(code int) {
+	code = RunCleanupHandlers(code)
 	debug.Log("exiting with status code %d", code)
 	os.Exit(code)
 }

cmd/restic/cmd_backup.go

@@ -41,9 +41,6 @@ EXIT STATUS
 Exit status is 0 if the command was successful.
 Exit status is 1 if there was a fatal error (no snapshot created).
 Exit status is 3 if some source data could not be read (incomplete snapshot created).
-Exit status is 10 if the repository does not exist.
-Exit status is 11 if the repository is already locked.
-Exit status is 12 if the password is incorrect.
 `,
 	PreRun: func(_ *cobra.Command, _ []string) {
 		if backupOptions.Host == "" {
@@ -55,7 +52,6 @@ Exit status is 12 if the password is incorrect.
 			backupOptions.Host = hostname
 		}
 	},
-	GroupID:           cmdGroupDefault,
 	DisableAutoGenTag: true,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		term, cancel := setupTermstatus()
@@ -91,11 +87,9 @@ type BackupOptions struct {
 	DryRun            bool
 	ReadConcurrency   uint
 	NoScan            bool
-	SkipIfUnchanged   bool
 }
 
 var backupOptions BackupOptions
-var backupFSTestHook func(fs fs.FS) fs.FS
 
 // ErrInvalidSourceData is used to report an incomplete backup
 var ErrInvalidSourceData = errors.New("at least one source file could not be read")
@@ -107,7 +101,7 @@ func init() {
 	f.StringVar(&backupOptions.Parent, "parent", "", "use this parent `snapshot` (default: latest snapshot in the group determined by --group-by and not newer than the timestamp determined by --time)")
 	backupOptions.GroupBy = restic.SnapshotGroupByOptions{Host: true, Path: true}
 	f.VarP(&backupOptions.GroupBy, "group-by", "g", "`group` snapshots by host, paths and/or tags, separated by comma (disable grouping with '')")
-	f.BoolVarP(&backupOptions.Force, "force", "f", false, `force re-reading the source files/directories (overrides the "parent" flag)`)
+	f.BoolVarP(&backupOptions.Force, "force", "f", false, `force re-reading the target files/directories (overrides the "parent" flag)`)
 
 	initExcludePatternOptions(f, &backupOptions.excludePatternOptions)
 
@@ -120,7 +114,7 @@ func init() {
 	f.BoolVar(&backupOptions.StdinCommand, "stdin-from-command", false, "interpret arguments as command to execute and store its stdout")
 	f.Var(&backupOptions.Tags, "tag", "add `tags` for the new snapshot in the format `tag[,tag,...]` (can be specified multiple times)")
 	f.UintVar(&backupOptions.ReadConcurrency, "read-concurrency", 0, "read `n` files concurrently (default: $RESTIC_READ_CONCURRENCY or 2)")
-	f.StringVarP(&backupOptions.Host, "host", "H", "", "set the `hostname` for the snapshot manually (default: $RESTIC_HOST). To prevent an expensive rescan use the \"parent\" flag")
+	f.StringVarP(&backupOptions.Host, "host", "H", "", "set the `hostname` for the snapshot manually. To prevent an expensive rescan use the \"parent\" flag")
 	f.StringVar(&backupOptions.Host, "hostname", "", "set the `hostname` for the snapshot manually")
 	err := f.MarkDeprecated("hostname", "use --host")
 	if err != nil {
@@ -139,16 +133,10 @@ func init() {
 	if runtime.GOOS == "windows" {
 		f.BoolVar(&backupOptions.UseFsSnapshot, "use-fs-snapshot", false, "use filesystem snapshot where possible (currently only Windows VSS)")
 	}
-	f.BoolVar(&backupOptions.SkipIfUnchanged, "skip-if-unchanged", false, "skip snapshot creation if identical to parent snapshot")
 
 	// parse read concurrency from env, on error the default value will be used
 	readConcurrency, _ := strconv.ParseUint(os.Getenv("RESTIC_READ_CONCURRENCY"), 10, 32)
 	backupOptions.ReadConcurrency = uint(readConcurrency)
-
-	// parse host from env, if not exists or empty the default value will be used
-	if host := os.Getenv("RESTIC_HOST"); host != "" {
-		backupOptions.Host = host
-	}
 }
 
 // filterExisting returns a slice of all existing items, or an error if no
@@ -165,7 +153,7 @@ func filterExisting(items []string) (result []string, err error) {
 	}
 
 	if len(result) == 0 {
-		return nil, errors.Fatal("all source directories/files do not exist")
+		return nil, errors.Fatal("all target directories/files do not exist")
 	}
 
 	return
@@ -264,7 +252,7 @@ func readFilenamesRaw(r io.Reader) (names []string, err error) {
 
 // Check returns an error when an invalid combination of options was set.
 func (opts BackupOptions) Check(gopts GlobalOptions, args []string) error {
-	if gopts.password == "" && !gopts.InsecureNoPassword {
+	if gopts.password == "" {
 		if opts.Stdin {
 			return errors.Fatal("cannot read both password and data from stdin")
 		}
@@ -410,7 +398,7 @@ func collectTargets(opts BackupOptions, args []string) (targets []string, err er
 	// and have the ability to use both files-from and args at the same time.
 	targets = append(targets, args...)
 	if len(targets) == 0 && !opts.Stdin {
-		return nil, errors.Fatal("nothing to backup, please specify source files/dirs")
+		return nil, errors.Fatal("nothing to backup, please specify target files/dirs")
 	}
 
 	targets, err = filterExisting(targets)
@@ -452,16 +440,7 @@ func findParentSnapshot(ctx context.Context, repo restic.ListerLoaderUnpacked, o
 }
 
 func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, term *termstatus.Terminal, args []string) error {
-	var vsscfg fs.VSSConfig
-	var err error
-
-	if runtime.GOOS == "windows" {
-		if vsscfg, err = fs.ParseVSSConfig(gopts.extended); err != nil {
-			return err
-		}
-	}
-
-	err = opts.Check(gopts, args)
+	err := opts.Check(gopts, args)
 	if err != nil {
 		return err
 	}
@@ -472,7 +451,6 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 	}
 
 	timeStamp := time.Now()
-	backupStart := timeStamp
 	if opts.TimeStamp != "" {
 		timeStamp, err = time.ParseInLocation(TimeFormat, opts.TimeStamp, time.Local)
 		if err != nil {
@@ -484,11 +462,10 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 		Verbosef("open repository\n")
 	}
 
-	ctx, repo, unlock, err := openWithAppendLock(ctx, gopts, opts.DryRun)
+	repo, err := OpenRepository(ctx, gopts)
 	if err != nil {
 		return err
 	}
-	defer unlock()
 
 	var progressPrinter backup.ProgressPrinter
 	if gopts.JSON {
@@ -500,6 +477,22 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 		calculateProgressInterval(!gopts.Quiet, gopts.JSON))
 	defer progressReporter.Done()
 
+	if opts.DryRun {
+		repo.SetDryRun()
+	}
+
+	if !gopts.JSON {
+		progressPrinter.V("lock repository")
+	}
+	if !opts.DryRun {
+		var lock *restic.Lock
+		lock, ctx, err = lockRepo(ctx, repo, gopts.RetryLock, gopts.JSON)
+		defer unlockRepo(lock)
+		if err != nil {
+			return err
+		}
+	}
+
 	// rejectByNameFuncs collect functions that can reject items from the backup based on path only
 	rejectByNameFuncs, err := collectRejectByNameFuncs(opts, repo)
 	if err != nil {
@@ -563,8 +556,8 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 			return err
 		}
 
-		errorHandler := func(item string, err error) {
-			_ = progressReporter.Error(item, err)
+		errorHandler := func(item string, err error) error {
+			return progressReporter.Error(item, err)
 		}
 
 		messageHandler := func(msg string, args ...interface{}) {
@@ -573,7 +566,7 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 			}
 		}
 
-		localVss := fs.NewLocalVss(errorHandler, messageHandler, vsscfg)
+		localVss := fs.NewLocalVss(errorHandler, messageHandler)
 		defer localVss.DeleteSnapshots()
 		targetFS = localVss
 	}
@@ -599,10 +592,6 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 		targets = []string{filename}
 	}
 
-	if backupFSTestHook != nil {
-		targetFS = backupFSTestHook(targetFS)
-	}
-
 	wg, wgCtx := errgroup.WithContext(ctx)
 	cancelCtx, cancel := context.WithCancel(wgCtx)
 	defer cancel()
@@ -649,20 +638,18 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 	}
 
 	snapshotOpts := archiver.SnapshotOptions{
-		Excludes:        opts.Excludes,
-		Tags:            opts.Tags.Flatten(),
-		BackupStart:     backupStart,
-		Time:            timeStamp,
-		Hostname:        opts.Host,
-		ParentSnapshot:  parentSnapshot,
-		ProgramVersion:  "restic " + version,
-		SkipIfUnchanged: opts.SkipIfUnchanged,
+		Excludes:       opts.Excludes,
+		Tags:           opts.Tags.Flatten(),
+		Time:           timeStamp,
+		Hostname:       opts.Host,
+		ParentSnapshot: parentSnapshot,
+		ProgramVersion: "restic " + version,
 	}
 
 	if !gopts.JSON {
 		progressPrinter.V("start backup on %v", targets)
 	}
-	_, id, summary, err := arch.Snapshot(ctx, targets, snapshotOpts)
+	_, id, err := arch.Snapshot(ctx, targets, snapshotOpts)
 
 	// cleanly shutdown all running goroutines
 	cancel()
@@ -676,7 +663,10 @@ func runBackup(ctx context.Context, opts BackupOptions, gopts GlobalOptions, ter
 	}
 
 	// Report finished execution
-	progressReporter.Finish(id, summary, opts.DryRun)
+	progressReporter.Finish(id, opts.DryRun)
+	if !gopts.JSON && !opts.DryRun {
+		progressPrinter.P("snapshot %s saved\n", id.Str())
+	}
 	if !success {
 		return ErrInvalidSourceData
 	}

cmd/restic/cmd_backup_integration_test.go

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 	"testing"
-	"time"
 
+	"github.com/restic/restic/internal/backend"
 	"github.com/restic/restic/internal/fs"
 	"github.com/restic/restic/internal/restic"
 	rtest "github.com/restic/restic/internal/test"
@@ -112,63 +112,6 @@ func TestBackupWithRelativePath(t *testing.T) {
 	rtest.Assert(t, latestSn.Parent != nil && latestSn.Parent.Equal(firstSnapshotID), "second snapshot selected unexpected parent %v instead of %v", latestSn.Parent, firstSnapshotID)
 }
 
-type vssDeleteOriginalFS struct {
-	fs.FS
-	testdata   string
-	hasRemoved bool
-}
-
-func (f *vssDeleteOriginalFS) Lstat(name string) (os.FileInfo, error) {
-	if !f.hasRemoved {
-		// call Lstat to trigger snapshot creation
-		_, _ = f.FS.Lstat(name)
-		// nuke testdata
-		var err error
-		for i := 0; i < 3; i++ {
-			// The CI sometimes runs into "The process cannot access the file because it is being used by another process" errors
-			// thus try a few times to remove the data
-			err = os.RemoveAll(f.testdata)
-			if err == nil {
-				break
-			}
-			time.Sleep(10 * time.Millisecond)
-		}
-		if err != nil {
-			return nil, err
-		}
-		f.hasRemoved = true
-	}
-	return f.FS.Lstat(name)
-}
-
-func TestBackupVSS(t *testing.T) {
-	if runtime.GOOS != "windows" || fs.HasSufficientPrivilegesForVSS() != nil {
-		t.Skip("vss fs test can only be run on windows with admin privileges")
-	}
-
-	env, cleanup := withTestEnvironment(t)
-	defer cleanup()
-
-	testSetupBackupData(t, env)
-	opts := BackupOptions{UseFsSnapshot: true}
-
-	var testFS *vssDeleteOriginalFS
-	backupFSTestHook = func(fs fs.FS) fs.FS {
-		testFS = &vssDeleteOriginalFS{
-			FS:       fs,
-			testdata: env.testdata,
-		}
-		return testFS
-	}
-	defer func() {
-		backupFSTestHook = nil
-	}()
-
-	testRunBackup(t, filepath.Dir(env.testdata), []string{"testdata"}, opts, env.gopts)
-	testListSnapshots(t, env.gopts, 1)
-	rtest.Equals(t, true, testFS.hasRemoved, "testdata was not removed")
-}
-
 func TestBackupParentSelection(t *testing.T) {
 	env, cleanup := withTestEnvironment(t)
 	defer cleanup()
@@ -307,18 +250,29 @@ func TestBackupTreeLoadError(t *testing.T) {
 	opts := BackupOptions{}
 	// Backup a subdirectory first, such that we can remove the tree pack for the subdirectory
 	testRunBackup(t, env.testdata, []string{"test"}, opts, env.gopts)
-	treePacks := listTreePacks(env.gopts, t)
+
+	r, err := OpenRepository(context.TODO(), env.gopts)
+	rtest.OK(t, err)
+	rtest.OK(t, r.LoadIndex(context.TODO(), nil))
+	treePacks := restic.NewIDSet()
+	r.Index().Each(context.TODO(), func(pb restic.PackedBlob) {
+		if pb.Type == restic.TreeBlob {
+			treePacks.Insert(pb.PackID)
+		}
+	})
 
 	testRunBackup(t, filepath.Dir(env.testdata), []string{filepath.Base(env.testdata)}, opts, env.gopts)
 	testRunCheck(t, env.gopts)
 
 	// delete the subdirectory pack first
-	removePacks(env.gopts, t, treePacks)
+	for id := range treePacks {
+		rtest.OK(t, r.Backend().Remove(context.TODO(), backend.Handle{Type: restic.PackFile, Name: id.String()}))
+	}
 	testRunRebuildIndex(t, env.gopts)
 	// now the repo is missing the tree blob in the index; check should report this
 	testRunCheckMustFail(t, env.gopts)
 	// second backup should report an error but "heal" this situation
-	err := testRunBackupAssumeFailure(t, filepath.Dir(env.testdata), []string{filepath.Base(env.testdata)}, opts, env.gopts)
+	err = testRunBackupAssumeFailure(t, filepath.Dir(env.testdata), []string{filepath.Base(env.testdata)}, opts, env.gopts)
 	rtest.Assert(t, err != nil, "backup should have reported an error for the subdirectory")
 	testRunCheck(t, env.gopts)
 
@@ -452,7 +406,6 @@ func TestIncrementalBackup(t *testing.T) {
 	t.Logf("repository grown by %d bytes", stat3.size-stat2.size)
 }
 
-// nolint: staticcheck // false positive nil pointer dereference check
 func TestBackupTags(t *testing.T) {
 	env, cleanup := withTestEnvironment(t)
 	defer cleanup()
@@ -488,7 +441,6 @@ func TestBackupTags(t *testing.T) {
 		"expected parent to be %v, got %v", parent.ID, newest.Parent)
 }
 
-// nolint: staticcheck // false positive nil pointer dereference check
 func TestBackupProgramVersion(t *testing.T) {
 	env, cleanup := withTestEnvironment(t)
 	defer cleanup()
@@ -685,32 +637,3 @@ func TestStdinFromCommandFailNoOutputAndExitCode(t *testing.T) {
 
 	testRunCheck(t, env.gopts)
 }
-
-func TestBackupEmptyPassword(t *testing.T) {
-	// basic sanity test that empty passwords work
-	env, cleanup := withTestEnvironment(t)
-	defer cleanup()
-
-	env.gopts.password = ""
-	env.gopts.InsecureNoPassword = true
-
-	testSetupBackupData(t, env)
-	testRunBackup(t, filepath.Dir(env.testdata), []string{"testdata"}, BackupOptions{}, env.gopts)
-	testListSnapshots(t, env.gopts, 1)
-	testRunCheck(t, env.gopts)
-}
-
-func TestBackupSkipIfUnchanged(t *testing.T) {
-	env, cleanup := withTestEnvironment(t)
-	defer cleanup()
-
-	testSetupBackupData(t, env)
-	opts := BackupOptions{SkipIfUnchanged: true}
-
-	for i := 0; i < 3; i++ {
-		testRunBackup(t, filepath.Dir(env.testdata), []string{"testdata"}, opts, env.gopts)
-		testListSnapshots(t, env.gopts, 1)
-	}
-
-	testRunCheck(t, env.gopts)
-}