From 05364500b6e0b9e1ec20acc34ddfa441c827bab8 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Sun, 23 Nov 2025 16:25:09 +0100 Subject: [PATCH] use correct context --- cmd/restic/cmd_copy.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/restic/cmd_copy.go b/cmd/restic/cmd_copy.go index e81db3915..db9ac1157 100644 --- a/cmd/restic/cmd_copy.go +++ b/cmd/restic/cmd_copy.go @@ -85,7 +85,6 @@ func collectAllSnapshots(ctx context.Context, opts CopyOptions, if sn.Original != nil { srcOriginal = *sn.Original } - if originalSns, ok := dstSnapshotByOriginal[srcOriginal]; ok { isCopy := false for _, originalSn := range originalSns { @@ -201,7 +200,7 @@ func copyTreeBatched(ctx context.Context, srcRepo restic.Repository, dstRepo res // each snapshot to be copied or once for all snapshots if opts.batch { // call WithBlobUploader() once and then loop over all selectedSnapshots - err := dstRepo.WithBlobUploader(context.TODO(), func(ctx context.Context, uploader restic.BlobSaver) error { + err := dstRepo.WithBlobUploader(ctx, func(ctx context.Context, uploader restic.BlobSaver) error { for _, sn := range selectedSnapshots { printer.P("\n%v", sn) printer.P(" copy started, this may take a while...") @@ -230,7 +229,7 @@ func copyTreeBatched(ctx context.Context, srcRepo restic.Repository, dstRepo res for _, sn := range selectedSnapshots { printer.P("\n%v", sn) printer.P(" copy started, this may take a while...") - err := dstRepo.WithBlobUploader(context.TODO(), func(ctx context.Context, uploader restic.BlobSaver) error { + err := dstRepo.WithBlobUploader(ctx, func(ctx context.Context, uploader restic.BlobSaver) error { if err := copyTree(ctx, srcRepo, dstRepo, visitedTrees, *sn.Tree, printer, uploader); err != nil { return err }