From fa3534da526624da6e6206fb07f9c48af15a5c0d Mon Sep 17 00:00:00 2001 From: Winfried Plappert Date: Wed, 19 Feb 2025 14:16:59 +0000 Subject: [PATCH] rewriter.go: rectify logic error while processing empty subdirectories KeepEmptyDirecoryGlobal was previosly a negated bool variable and the negation was not taken away. --- internal/walker/rewriter.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/walker/rewriter.go b/internal/walker/rewriter.go index 852571995..595c4d8d2 100644 --- a/internal/walker/rewriter.go +++ b/internal/walker/rewriter.go @@ -41,7 +41,6 @@ func NewTreeRewriter(opts RewriteOpts) *TreeRewriter { rw := &TreeRewriter{ opts: opts, } - rw.opts.KeepEmptyDirecoryGlobal = true if !opts.DisableNodeCache { rw.replaces = make(idMap) @@ -154,7 +153,7 @@ func (t *TreeRewriter) RewriteTree(ctx context.Context, repo BlobLoadSaver, node } // check for empty subtree condition here - if !t.opts.KeepEmptyDirecoryGlobal && err == nil && newID.IsNull() { + if t.opts.KeepEmptyDirecoryGlobal && err == nil && newID.IsNull() { continue } @@ -167,7 +166,7 @@ func (t *TreeRewriter) RewriteTree(ctx context.Context, repo BlobLoadSaver, node } // check for empty node list - if !t.opts.KeepEmptyDirecoryGlobal && countInserts == 0 { + if t.opts.KeepEmptyDirecoryGlobal && countInserts == 0 { // current subdirectory is empty - due to no includes: create condition here return restic.ID{}, nil }