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

Merge branch 'master' into bloom

Browse source 
Conflicts:
	Command/Commit.hs
	debian/changelog
This commit is contained in:
Joey Hess 2012-03-14 12:41:48 -04:00
commit 342fc28437
5 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Commit.hs
View file

@ -22,7 +22,8 @@ seek = [withNothing start]
start :: CommandStart
start = next $ next $ do
Annex.Branch.commit "update"
runhook =<< (inRepo $ Git.hookPath "annex-content")
_ <- runhook =<< (inRepo $ Git.hookPath "annex-content")
return True
where
runhook (Just hook) = liftIO $ boolSystem hook []
runhook Nothing = return True