summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-22 20:16:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-22 20:18:00 -0400
commit9315d571f319e99d309f6ffc0921d892db5123fa (patch)
tree000933c09c57b370662faade412a66e825349a97
parent9047846796948518927555f2ffe9c18c44ddcb63 (diff)
Support import in direct mode.
-rw-r--r--Command/Import.hs2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/Command/Import.hs b/Command/Import.hs
index cadf8fa2e..518666af9 100644
--- a/Command/Import.hs
+++ b/Command/Import.hs
@@ -15,7 +15,7 @@ import qualified Annex
import qualified Command.Add
def :: [Command]
-def = [notDirect $ notBareRepo $ command "import" paramPaths seek
+def = [notBareRepo $ command "import" paramPaths seek
SectionCommon "move and add files from outside git working copy"]
seek :: [CommandSeek]
diff --git a/debian/changelog b/debian/changelog
index 221fb3bee..90cf38b06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ git-annex (4.20130710) UNRELEASED; urgency=low
* For long hostnames, use a hash of the hostname to generate the socket
file for ssh connection caching.
* Support unannex and uninit in direct mode.
+ * Support import in direct mode.
-- Joey Hess <joeyh@debian.org> Tue, 09 Jul 2013 19:17:13 -0400