summaryrefslogtreecommitdiff
path: root/Command/Unannex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-02-28 16:10:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-02-28 16:18:55 -0400
commitfcdc4797a9ab2b792a9bb20f2ca9802b8f6d5a1e (patch)
tree0471848c11df7c1481d8c735eab1280d7684eddc /Command/Unannex.hs
parent7e5678bcf7cd78bd04520117201be37dc9d4d544 (diff)
use ShellParam type
So, I have a type checked safe handling of filenames starting with dashes, throughout the code.
Diffstat (limited to 'Command/Unannex.hs')
-rw-r--r--Command/Unannex.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Unannex.hs b/Command/Unannex.hs
index 19cb1624e..42dc1fb0a 100644
--- a/Command/Unannex.hs
+++ b/Command/Unannex.hs
@@ -58,7 +58,7 @@ cleanup file key = do
g <- Annex.gitRepo
liftIO $ removeFile file
- liftIO $ Git.run g ["rm", "--quiet", "--", file]
+ liftIO $ Git.run g "rm" [Params "--quiet --", File file]
-- git rm deletes empty directories; put them back
liftIO $ createDirectoryIfMissing True (parentDir file)
@@ -68,6 +68,6 @@ cleanup file key = do
-- Commit staged changes at end to avoid confusing the
-- pre-commit hook if this file is later added back to
-- git as a normal, non-annexed file.
- Annex.queue "commit" ["-m", "content removed from git annex"] "-a"
+ Annex.queue "commit" [Params "-a -m", Param "content removed from git annex"] "-a"
return True