use -- before filenames when running git add, git rm, etc

This commit is contained in:
Joey Hess 2010-11-10 14:15:21 -04:00
parent f5f472e855
commit fb824f7eb0
6 changed files with 8 additions and 8 deletions

View file

@ -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

View file

@ -37,5 +37,5 @@ perform file link = do
cleanup :: FilePath -> SubCmdCleanup
cleanup file = do
Annex.queue "add" [] file
Annex.queue "add" ["--"] file
return True

View file

@ -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

View file

@ -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

View file

@ -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)