summaryrefslogtreecommitdiff
path: root/Command/PreCommit.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-08-20 11:25:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-08-20 11:37:02 -0400
commitb44e74ace2d74954c503930b9edb75d0aa9d7b52 (patch)
treef07fa949063d3e93987dad89e3348e6d8b692b76 /Command/PreCommit.hs
parent5fda2e3cb3f93771fb70a3ccbf88eeaf4e7f924a (diff)
Ensure that all lock fds are close-on-exec, fixing various problems with them being inherited by child processes such as git commands.
(With the exception of daemon pid locking.) This fixes at part of #758630. I reproduced the assistant locking eg, a removable drive's annex journal lock file and forking a long-running git-cat-file process that inherited that lock. This did not affect Windows. Considered doing a portable Utility.LockFile layer, but git-annex uses posix locks in several special ways that have no direct Windows equivilant, and it seems like it would mostly be a complication. This commit was sponsored by Protonet.
Diffstat (limited to 'Command/PreCommit.hs')
-rw-r--r--Command/PreCommit.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index 09ff042aa..61508ba9b 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -101,6 +101,7 @@ lockPreCommitHook a = do
#ifndef mingw32_HOST_OS
lock lockfile mode = do
l <- liftIO $ noUmask mode $ createFile lockfile mode
+ setFdOption l CloseOnExec True
liftIO $ waitToSetLock l (WriteLock, AbsoluteSeek, 0, 0)
return l
unlock = closeFd