aboutsummaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-07-20 12:05:22 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-07-20 12:05:26 -0400
commit1fa1b334d73f67627af8c18831c97dc1de036f96 (patch)
tree1f34933db1ebd7ef48ec9e9f2b1a4d002ec648ee /Command/Sync.hs
parent93c48c4fdb3c7ae80486a7699b25f2e29c2b7cd0 (diff)
--branch, stage 1
Added --branch option to copy, drop, fsck, get, metadata, mirror, move, and whereis commands. This option makes git-annex operate on files that are included in a specified branch (or other treeish). The names of the files from the branch that are being operated on are not displayed yet; only the keys. Displaying the filenames will need changes to every affected command. Also, note that --branch can be specified repeatedly. This is not really documented, but seemed worth supporting, especially since we may later want the ability to operate on all branches matching a refspec. However, when operating on two branches that contain the same key, that key will be operated on twice.
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r--Command/Sync.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index c003aa41d..4d8cdf2d1 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -441,7 +441,7 @@ seekSyncContent o rs = do
Just WantAllKeys -> Just <$> genBloomFilter (seekworktree mvar [])
_ -> seekworktree mvar [] (const noop) >> pure Nothing
withKeyOptions' (keyOptions o) False
- (seekkeys mvar bloom)
+ (return (seekkeys mvar bloom))
(const noop)
[]
finishCommandActions