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

avoid pre-commit in direct mode

Browse source 
It was a no-op until my recent change that made lookupFile work in direct
mode.
This commit is contained in:
Joey Hess 2013-01-05 16:06:20 -04:00
parent 1cdf2b923d
commit 20fafc6a2d
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Command/PreCommit.hs
View file

@ -11,6 +11,7 @@ import Common.Annex
import Command import Command
import qualified Command.Add import qualified Command.Add
import qualified Command.Fix import qualified Command.Fix
import Config
def :: [Command] def :: [Command]
def = [command "pre-commit" paramPaths seek "run by git pre-commit hook"] def = [command "pre-commit" paramPaths seek "run by git pre-commit hook"]
@ -19,9 +20,12 @@ def = [command "pre-commit" paramPaths seek "run by git pre-commit hook"]
- And, it needs to inject unlocked files into the annex. -} - And, it needs to inject unlocked files into the annex. -}
seek :: [CommandSeek] seek :: [CommandSeek]
seek = seek =
[ withFilesToBeCommitted $ whenAnnexed Command.Fix.start [ withFilesToBeCommitted $ whenNotDirect $ whenAnnexed $ Command.Fix.start
, withFilesUnlockedToBeCommitted start] , withFilesUnlockedToBeCommitted start]
whenNotDirect :: (FilePath -> Annex (Maybe CommandPerform)) -> FilePath -> Annex (Maybe CommandPerform)
whenNotDirect a f = ifM isDirect ( stop , a f )
start :: FilePath -> CommandStart start :: FilePath -> CommandStart
start file = next $ perform file start file = next $ perform file