From c545701224cddfea80b103ce5eab570df33b711a Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 3 Feb 2017 14:36:14 -0400
Subject: [PATCH] make sync --no-commit override annex.annex.autocommit

---
 Command/Sync.hs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Command/Sync.hs b/Command/Sync.hs
index 581cad5620..37fc343e7f 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -66,6 +66,7 @@ cmd = withGlobalOptions [jobsOption] $
 data SyncOptions  = SyncOptions
 	{ syncWith :: CmdParams
 	, commitOption :: Bool
+	, noCommitOption :: Bool
 	, messageOption :: Maybe String
 	, pullOption :: Bool
 	, pushOption :: Bool
@@ -80,8 +81,13 @@ optParser desc = SyncOptions
 		( metavar desc
 		<> completeRemotes
 		))
-	<*> invertableSwitch "commit" True
-		( help "avoid git commit" 
+	<*> switch
+		( long "commit"
+		<> help "commit changes to git"
+		)
+	<*> switch
+		( long "no-commit"
+		<> help "avoid git commit" 
 		)
 	<*> optional (strOption
 		( long "message" <> short 'm' <> metavar "MSG"
@@ -246,7 +252,7 @@ commit o = stopUnless shouldcommit $ next $ next $ do
 		)
   where
 	shouldcommit = pure (commitOption o)
-		<&&> getGitConfigVal annexAutoCommit
+		<||> (pure (not (noCommitOption o)) <&&> getGitConfigVal annexAutoCommit)
 
 commitMsg :: Annex String
 commitMsg = do
-- 
2.30.2