use -- before filenames when running git add, git rm, etc
This commit is contained in:
parent
f5f472e855
commit
fb824f7eb0
6 changed files with 8 additions and 8 deletions
|
@ -44,5 +44,5 @@ cleanup file key = do
|
||||||
|
|
||||||
link <- calcGitLink file key
|
link <- calcGitLink file key
|
||||||
liftIO $ createSymbolicLink link file
|
liftIO $ createSymbolicLink link file
|
||||||
Annex.queue "add" [] file
|
Annex.queue "add" ["--"] file
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -37,5 +37,5 @@ perform file link = do
|
||||||
|
|
||||||
cleanup :: FilePath -> SubCmdCleanup
|
cleanup :: FilePath -> SubCmdCleanup
|
||||||
cleanup file = do
|
cleanup file = do
|
||||||
Annex.queue "add" [] file
|
Annex.queue "add" ["--"] file
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -41,5 +41,5 @@ perform file key = do
|
||||||
return $ Just $ cleanup file
|
return $ Just $ cleanup file
|
||||||
cleanup :: FilePath -> SubCmdCleanup
|
cleanup :: FilePath -> SubCmdCleanup
|
||||||
cleanup file = do
|
cleanup file = do
|
||||||
Annex.queue "add" [] file
|
Annex.queue "add" ["--"] file
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -85,7 +85,7 @@ moveToCleanup remote key tmpfile = do
|
||||||
g <- Annex.gitRepo
|
g <- Annex.gitRepo
|
||||||
remoteuuid <- getUUID remote
|
remoteuuid <- getUUID remote
|
||||||
logfile <- liftIO $ logChange g key remoteuuid ValuePresent
|
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
|
-- Cleanup on the local side is the same as done for the
|
||||||
-- drop subcommand.
|
-- drop subcommand.
|
||||||
Command.Drop.cleanup key
|
Command.Drop.cleanup key
|
||||||
|
@ -128,5 +128,5 @@ moveFromCleanup remote key = do
|
||||||
remoteuuid <- getUUID remote
|
remoteuuid <- getUUID remote
|
||||||
g <- Annex.gitRepo
|
g <- Annex.gitRepo
|
||||||
logfile <- liftIO $ logChange g key remoteuuid ValueMissing
|
logfile <- liftIO $ logChange g key remoteuuid ValueMissing
|
||||||
Annex.queue "add" [] logfile
|
Annex.queue "add" ["--"] logfile
|
||||||
return ok
|
return ok
|
||||||
|
|
|
@ -40,7 +40,7 @@ cleanup file key = do
|
||||||
g <- Annex.gitRepo
|
g <- Annex.gitRepo
|
||||||
|
|
||||||
liftIO $ removeFile file
|
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
|
-- git rm deletes empty directories; put them back
|
||||||
liftIO $ createDirectoryIfMissing True (parentDir file)
|
liftIO $ createDirectoryIfMissing True (parentDir file)
|
||||||
|
|
||||||
|
|
4
Core.hs
4
Core.hs
|
@ -131,7 +131,7 @@ logStatus key status = do
|
||||||
g <- Annex.gitRepo
|
g <- Annex.gitRepo
|
||||||
u <- getUUID g
|
u <- getUUID g
|
||||||
logfile <- liftIO $ logChange g key u status
|
logfile <- liftIO $ logChange g key u status
|
||||||
Annex.queue "add" [] logfile
|
Annex.queue "add" ["--"] logfile
|
||||||
|
|
||||||
{- Runs an action, passing it a temporary filename to download,
|
{- Runs an action, passing it a temporary filename to download,
|
||||||
- and if the action succeeds, moves the temp file into
|
- and if the action succeeds, moves the temp file into
|
||||||
|
@ -261,5 +261,5 @@ upgradeFrom0 = do
|
||||||
link <- calcGitLink f k
|
link <- calcGitLink f k
|
||||||
liftIO $ removeFile f
|
liftIO $ removeFile f
|
||||||
liftIO $ createSymbolicLink link f
|
liftIO $ createSymbolicLink link f
|
||||||
Annex.queue "add" [] f
|
Annex.queue "add" ["--"] f
|
||||||
fixlinks fs
|
fixlinks fs
|
||||||
|
|
Loading…
Add table
Reference in a new issue