summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-11-10 14:15:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-11-10 14:15:21 -0400
commitfb824f7eb03c10301ad897d9e1eeb0aa40492a3d (patch)
treeeaf3ddfc0ba7932f8f2e79be315e11fed191818e /Command
parentf5f472e8550ae438b1dc751a18cccf0efbaccd1d (diff)
use -- before filenames when running git add, git rm, etc
Diffstat (limited to 'Command')
-rw-r--r--Command/Add.hs2
-rw-r--r--Command/Fix.hs2
-rw-r--r--Command/FromKey.hs2
-rw-r--r--Command/Move.hs4
-rw-r--r--Command/Unannex.hs2
5 files changed, 6 insertions, 6 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index 6c5d24f84..649b466bb 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -44,5 +44,5 @@ cleanup file key = do
link <- calcGitLink file key
liftIO $ createSymbolicLink link file
- Annex.queue "add" [] file
+ Annex.queue "add" ["--"] file
return True
diff --git a/Command/Fix.hs b/Command/Fix.hs
index 7963a1d2e..9db832cc7 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -37,5 +37,5 @@ perform file link = do
cleanup :: FilePath -> SubCmdCleanup
cleanup file = do
- Annex.queue "add" [] file
+ Annex.queue "add" ["--"] file
return True
diff --git a/Command/FromKey.hs b/Command/FromKey.hs
index de555475c..229a93684 100644
--- a/Command/FromKey.hs
+++ b/Command/FromKey.hs
@@ -41,5 +41,5 @@ perform file key = do
return $ Just $ cleanup file
cleanup :: FilePath -> SubCmdCleanup
cleanup file = do
- Annex.queue "add" [] file
+ Annex.queue "add" ["--"] file
return True
diff --git a/Command/Move.hs b/Command/Move.hs
index 6ca923a31..e0b079193 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -85,7 +85,7 @@ moveToCleanup remote key tmpfile = do
g <- Annex.gitRepo
remoteuuid <- getUUID remote
logfile <- liftIO $ logChange g key remoteuuid ValuePresent
- Annex.queue "add" [] logfile
+ Annex.queue "add" ["--"] logfile
-- Cleanup on the local side is the same as done for the
-- drop subcommand.
Command.Drop.cleanup key
@@ -128,5 +128,5 @@ moveFromCleanup remote key = do
remoteuuid <- getUUID remote
g <- Annex.gitRepo
logfile <- liftIO $ logChange g key remoteuuid ValueMissing
- Annex.queue "add" [] logfile
+ Annex.queue "add" ["--"] logfile
return ok
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index a9c18f765..f5e78e55a 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -40,7 +40,7 @@ cleanup file key = do
g <- Annex.gitRepo
liftIO $ removeFile file
- liftIO $ Git.run g ["rm", "--quiet", file]
+ liftIO $ Git.run g ["rm", "--quiet", "--", file]
-- git rm deletes empty directories; put them back
liftIO $ createDirectoryIfMissing True (parentDir file)