diff --git a/Command/Commit.hs b/Command/Commit.hs index 8e9d3bff9c..1175a0d52e 100644 --- a/Command/Commit.hs +++ b/Command/Commit.hs @@ -10,6 +10,7 @@ module Command.Commit where import Command import qualified Annex.Branch import qualified Git +import Git.Types cmd :: Command cmd = command "commit" SectionPlumbing @@ -20,10 +21,12 @@ seek :: CmdParams -> CommandSeek seek = withNothing (commandAction start) start :: CommandStart -start = starting "commit" (ActionItemOther (Just "git-annex")) (SeekInput []) $ do - Annex.Branch.commit =<< Annex.Branch.commitMessage - _ <- runhook <=< inRepo $ Git.hookPath "annex-content" - next $ return True +start = starting "commit" ai si $ do + Annex.Branch.commit =<< Annex.Branch.commitMessage + _ <- runhook <=< inRepo $ Git.hookPath "annex-content" + next $ return True where runhook (Just hook) = liftIO $ boolSystem hook [] runhook Nothing = return True + ai = ActionItemOther (Just (fromRef Annex.Branch.name)) + si = SeekInput [] diff --git a/Command/Forget.hs b/Command/Forget.hs index 2068f2e44e..85acb60e2a 100644 --- a/Command/Forget.hs +++ b/Command/Forget.hs @@ -12,6 +12,7 @@ import qualified Annex.Branch as Branch import Logs.Transitions import qualified Annex import Annex.VectorClock +import Git.Types cmd :: Command cmd = command "forget" SectionMaintenance @@ -41,7 +42,7 @@ start o = starting "forget" ai si $ do else basets perform ts =<< Annex.getState Annex.force where - ai = ActionItemOther (Just "git-annex") + ai = ActionItemOther (Just (fromRef Branch.name)) si = SeekInput [] perform :: Transitions -> Bool -> CommandPerform diff --git a/Command/Merge.hs b/Command/Merge.hs index 285a6febb0..2b5a6b2c8d 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -13,6 +13,7 @@ import qualified Git import qualified Git.Branch import Annex.CurrentBranch import Command.Sync (prepMerge, mergeLocal, mergeConfig, merge, SyncOptions(..)) +import Git.Types cmd :: Command cmd = command "merge" SectionMaintenance @@ -35,7 +36,7 @@ mergeAnnexBranch = starting "merge" ai si $ do Annex.Branch.commit =<< Annex.Branch.commitMessage next $ return True where - ai = ActionItemOther (Just "git-annex") + ai = ActionItemOther (Just (fromRef Annex.Branch.name)) si = SeekInput [] mergeSyncedBranch :: CommandStart