diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-14 12:41:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-14 12:41:48 -0400 |
| commit | 342fc28437f59edcea8fb61ff987ea1899140f35 (patch) | |
| tree | f192d5ec5be8a817124ccba3d08d03333e94e62e /Command | |
| parent | 95a1f6b2accca9b7c6a6c30c92380dc0de57d3a0 (diff) | |
| parent | 6cb4743cfb105427a00b551ebd51fc5c9626bfea (diff) | |
Merge branch 'master' into bloom
Conflicts:
Command/Commit.hs
debian/changelog
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Commit.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Commit.hs b/Command/Commit.hs index 19b0bc250..1c82ed7df 100644 --- a/Command/Commit.hs +++ b/Command/Commit.hs @@ -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 |