diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-31 19:05:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-31 19:05:47 -0400 |
| commit | 7cd0ba73996b2ed092f8ee7cb62d0edf9f8f3f1b (patch) | |
| tree | 6a23e810b4b3d8a3a4198a25190e0a8b3ce58c62 /Annex/Direct.hs | |
| parent | 4dfa6059e42995eb050f58656fc32f9ee5d3ef16 (diff) | |
| parent | dc6d60cb3cbeed45e0651818f762445812f84e7a (diff) | |
Merge branch 'adjustedbranch'
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index e85d8f447..d16692226 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -225,7 +225,7 @@ mergeDirectCommit allowff old branch commitmode = do let merge_msg = d </> "MERGE_MSG" let merge_mode = d </> "MERGE_MODE" ifM (pure allowff <&&> canff) - ( inRepo $ Git.Branch.update Git.Ref.headRef branch -- fast forward + ( inRepo $ Git.Branch.update "merge" Git.Ref.headRef branch -- fast forward , do msg <- liftIO $ catchDefaultIO ("merge " ++ fromRef branch) $ @@ -462,7 +462,7 @@ switchHEAD = maybe noop switch =<< inRepo Git.Branch.currentUnsafe where switch orighead = do let newhead = directBranch orighead - maybe noop (inRepo . Git.Branch.update newhead) + maybe noop (inRepo . Git.Branch.update "entering direct mode" newhead) =<< inRepo (Git.Ref.sha orighead) inRepo $ Git.Branch.checkout newhead @@ -475,7 +475,7 @@ switchHEADBack = maybe noop switch =<< inRepo Git.Branch.currentUnsafe case v of Just headsha | orighead /= currhead -> do - inRepo $ Git.Branch.update orighead headsha + inRepo $ Git.Branch.update "leaving direct mode" orighead headsha inRepo $ Git.Branch.checkout orighead inRepo $ Git.Branch.delete currhead _ -> inRepo $ Git.Branch.checkout orighead |