Merge pull request #5096 from MichaelEischer/prune-allow-dry-run

prune: allow dry-run without taking a lock
This commit is contained in:
Michael Eischer authored and GitHub committed 2024-11-01 15:34:15 +01:00
commit e18a2a0072
2 files changed
+12 -1

No files matched your search

+5 -1
View File
@@ -149,7 +149,11 @@ func runPrune(ctx context.Context, opts PruneOptions, gopts GlobalOptions, term
return errors.Fatal("disabled compression and `--repack-uncompressed` are mutually exclusive")
}
ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, false)
if gopts.NoLock && !opts.DryRun {
return errors.Fatal("--no-lock is only applicable in combination with --dry-run for prune command")
}
ctx, repo, unlock, err := openWithExclusiveLock(ctx, gopts, opts.DryRun && gopts.NoLock)
if err != nil {
return err
}