summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-07-30 13:33:35 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-07-30 13:33:35 -0400
commitad67cfe65ed387cbc64b2da7dd88603985999882 (patch)
tree3b491a8a46f66f787c5bc52a7d082fadf140aca7
parentcc32ffe05f5b8453ac09f2a12b2a17e41d9d7584 (diff)
The last release accidentially removed a number of options from the copy command. (-J, file matching options, etc). These have been added back.
-rw-r--r--Command/Copy.hs7
-rw-r--r--debian/changelog3
2 files changed, 7 insertions, 3 deletions
diff --git a/Command/Copy.hs b/Command/Copy.hs
index 1c817f67c..77711f05b 100644
--- a/Command/Copy.hs
+++ b/Command/Copy.hs
@@ -15,9 +15,10 @@ import Annex.Wanted
import Annex.NumCopies
cmd :: Command
-cmd = command "copy" SectionCommon
- "copy content of files to/from another repository"
- paramPaths (seek <--< optParser)
+cmd = withGlobalOptions (jobsOption : annexedMatchingOptions) $
+ command "copy" SectionCommon
+ "copy content of files to/from another repository"
+ paramPaths (seek <--< optParser)
data CopyOptions = CopyOptions
{ moveOptions :: Command.Move.MoveOptions
diff --git a/debian/changelog b/debian/changelog
index d6cf55023..376d4b017 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ git-annex (5.20150728) UNRELEASED; urgency=medium
* webapp: Support enabling known gitlab.com remotes.
* Fix rsync special remote to work when -Jn is used for concurrent
uploads.
+ * The last release accidentially removed a number of options from the
+ copy command. (-J, file matching options, etc). These have been added
+ back.
-- Joey Hess <id@joeyh.name> Mon, 27 Jul 2015 15:57:07 -0400