mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

nocommit does not make sense in unannex mode

Browse source
This commit is contained in:
Joey Hess 2010-10-16 22:43:38 -04:00
parent da453ba701
commit 96451ac392
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Commands.hs
View file

@ -122,11 +122,15 @@ addCmd file = inBackend file err $ do
{- Undo addCmd. -}
unannexCmd :: FilePath -> Annex ()
unannexCmd file = notinBackend file err $ \(key, backend) -> do
Backend.removeKey backend key
logStatus key ValueMissing
g <- Annex.gitRepo
let src = annexLocation g key
liftIO $ moveout g src
nocommit <- Annex.flagIsSet NoCommit
if (nocommit)
then error "--nocommit cannot be used in unannex mode"
else do
Backend.removeKey backend key
logStatus key ValueMissing
g <- Annex.gitRepo
let src = annexLocation g key
liftIO $ moveout g src
where
err = error $ "not annexed " ++ file
moveout g src = do