remove pre-commit hook

This was originally added so that unannex could prevent the hook from
running while files were in a state that the hook would interpret as
old-style unlocked and so would lock.

Now that's gone, so the only thing the hook was preventing was two
pre-commit processes running simulantaneously. But such concurrency
is normal in git-annex and should not be a problem.

Does mean that .git/hooks/pre-commit-annex might run more concurrently,
that seems the only risk of it causing any problems.

diff --git a/Annex/Locations.hs b/Annex/Locations.hs
index 2aa7605310909fa25adb88c573e4640b46d1dfb3..cceeff77c8c1fee7435a456fa41b07d9348302fd 100644 (file)
--- a/Annex/Locations.hs
+++ b/Annex/Locations.hs
@@ -66,7 +66,6 @@ module Annex.Locations (
        gitAnnexJournalDir',
        gitAnnexJournalLock,
        gitAnnexGitQueueLock,
-       gitAnnexPreCommitLock,
        gitAnnexMergeLock,
        gitAnnexIndex,
        gitAnnexIndexStatus,
@@ -469,10 +468,6 @@ gitAnnexJournalLock r = fromRawFilePath $ gitAnnexDir r P.</> "journal.lck"
 gitAnnexGitQueueLock :: Git.Repo -> FilePath
 gitAnnexGitQueueLock r = fromRawFilePath $ gitAnnexDir r P.</> "gitqueue.lck"
 
-{- Lock file for the pre-commit hook. -}
-gitAnnexPreCommitLock :: Git.Repo -> FilePath
-gitAnnexPreCommitLock r = fromRawFilePath $ gitAnnexDir r P.</> "precommit.lck"
-
 {- Lock file for direct mode merge. -}
 gitAnnexMergeLock :: Git.Repo -> FilePath
 gitAnnexMergeLock r = fromRawFilePath $ gitAnnexDir r P.</> "merge.lck"

diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index ad39953e3c2607291b25edbad3b43b9b4c018aca..eb30b15941879ebc85fdbe60e767614b3dc20abc 100644 (file)
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -32,7 +32,7 @@ cmd = command "pre-commit" SectionPlumbing
        (withParams seek)
 
 seek :: CmdParams -> CommandSeek
-seek ps = lockPreCommitHook $ do
+seek ps = do
        l <- workTreeItems ps
        -- fix symlinks to files being committed
        flip withFilesToBeCommitted l $ \f -> commandAction $
@@ -74,7 +74,3 @@ showMetaDataChange = showLongNote . unlines . concatMap showmeta . fromMetaData
        showset v
                | isSet v = "+"
                | otherwise = "-"
-
-{- Takes exclusive lock; blocks until available. -}
-lockPreCommitHook :: Annex a -> Annex a
-lockPreCommitHook = withExclusiveLock gitAnnexPreCommitLock