From 96451ac392d42973f508da08d7c1197c83c659a6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 16 Oct 2010 22:43:38 -0400
Subject: [PATCH] nocommit does not make sense in unannex mode

---
 Commands.hs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Commands.hs b/Commands.hs
index 1364a1b35e..be0a8e37ff 100644
--- a/Commands.hs
+++ b/Commands.hs
@@ -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