From 9db7c51eaaf5e1286ea7f65503d6388df7f39e5a Mon Sep 17 00:00:00 2001 From: Nick Gaya Date: Mon, 5 Apr 2021 12:36:39 -0700 Subject: [PATCH] sync: don't warn about --no-traverse when --files-from is set --- fs/sync/sync.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/sync/sync.go b/fs/sync/sync.go index e8ce10ad1..a97231424 100644 --- a/fs/sync/sync.go +++ b/fs/sync/sync.go @@ -155,7 +155,9 @@ func newSyncCopyMove(ctx context.Context, fdst, fsrc fs.Fs, deleteMode fs.Delete // Input context - cancel this for graceful stop s.inCtx, s.inCancel = context.WithCancel(s.ctx) if s.noTraverse && s.deleteMode != fs.DeleteModeOff { - fs.Errorf(nil, "Ignoring --no-traverse with sync") + if !fi.HaveFilesFrom() { + fs.Errorf(nil, "Ignoring --no-traverse with sync") + } s.noTraverse = false } s.trackRenamesStrategy, err = parseTrackRenamesStrategy(ci.TrackRenamesStrategy)