diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-31 12:27:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-31 12:27:48 -0400 |
| commit | cd92a8bca739998bb70b5a131181c7eb52980ffe (patch) | |
| tree | 1ecd4e601625eadb97bcd97bf84c97ae3084d985 /Annex | |
| parent | fb5ffecf202dd8c6b9ea13ab383e7332fa88f0f2 (diff) | |
add reflog messages
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 8 | ||||
| -rw-r--r-- | Annex/Direct.hs | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 551263cca..ef6d873df 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -167,7 +167,7 @@ adjustToCrippledFileSystem = do adjustBranch :: Adjustment -> OrigBranch -> Annex AdjBranch adjustBranch adj origbranch = do sha <- adjust adj origbranch - inRepo $ Git.Branch.update adjbranch sha + inRepo $ Git.Branch.update "entering adjusted branch" adjbranch sha return adjbranch where adjbranch = originalToAdjusted origbranch adj @@ -254,7 +254,7 @@ updateAdjustedBranch tomerge (origbranch, adj) commitmode = catchBoolIO $ -} recommit commitsprevented currbranch parent (Just commit) = do commitsha <- commitAdjustedTree (commitTree commit) parent - inRepo $ Git.Branch.update currbranch commitsha + inRepo $ Git.Branch.update "merging into adjusted branch" currbranch commitsha propigateAdjustedCommits' origbranch (adj, currbranch) commitsprevented return True recommit _ _ _ Nothing = return False @@ -292,7 +292,7 @@ propigateAdjustedCommits' origbranch (adj, currbranch) _commitsprevented = do -- in order made. [Param "--reverse"] go parent _ [] = do - inRepo $ Git.Branch.update origbranch parent + inRepo $ Git.Branch.update "updating adjusted branch" origbranch parent return (Right parent) go parent pastadjcommit (sha:l) = do mc <- catCommit sha @@ -311,7 +311,7 @@ propigateAdjustedCommits' origbranch (adj, currbranch) _commitsprevented = do -- and reparent it on top of the new -- version of the origbranch. commitAdjustedTree (commitTree currcommit) newparent - >>= inRepo . Git.Branch.update currbranch + >>= inRepo . Git.Branch.update "rebasing adjusted branch on top of updated original branch" currbranch {- Reverses an adjusted commit, and commit on top of the provided newparent, - yielding a commit sha. 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 |