Merge pull request #2773 from aawsome/index-uploads+knownblobs

Fix non-intuitive repo behavior

cmd/restic/cmd_backup.go

@@ -575,24 +575,6 @@ func runBackup(opts BackupOptions, gopts GlobalOptions, term *termstatus.Termina
 		ParentSnapshot: *parentSnapshotID,
 	}
 
-	uploader := archiver.IndexUploader{
-		Repository: repo,
-		Start: func() {
-			if !gopts.JSON {
-				p.VV("uploading intermediate index")
-			}
-		},
-		Complete: func(id restic.ID) {
-			if !gopts.JSON {
-				p.V("uploaded intermediate index %v", id.Str())
-			}
-		},
-	}
-
-	t.Go(func() error {
-		return uploader.Upload(gopts.ctx, t.Context(gopts.ctx), 30*time.Second)
-	})
-
 	if !gopts.JSON {
 		p.V("start backup on %v", targets)
 	}

cmd/restic/cmd_prune.go

@@ -87,6 +87,9 @@ func runPrune(gopts GlobalOptions) error {
 		return err
 	}
 
+	// we do not need index updates while pruning!
+	repo.DisableAutoIndexUpdate()
+
 	return pruneRepository(gopts, repo)
 }
 

cmd/restic/cmd_recover.go

@@ -130,11 +130,6 @@ func runRecover(gopts GlobalOptions) error {
 		return errors.Fatalf("unable to save blobs to the repo: %v", err)
 	}
 
-	err = repo.SaveIndex(gopts.ctx)
-	if err != nil {
-		return errors.Fatalf("unable to save new index to the repo: %v", err)
-	}
-
 	sn, err := restic.NewSnapshot([]string{"/recover"}, []string{}, hostname, time.Now())
 	if err != nil {
 		return errors.Fatalf("unable to save snapshot: %v", err)