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

fix incomplete renaming of function

Browse source
This commit is contained in:
Joey Hess 2018-10-22 16:44:18 -04:00
parent 6ee660f33d
commit 63cf3381f0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/AdjustedBranch.hs
View file

@ -218,7 +218,7 @@ updateAdjustedBranch adj@(PresenceAdjustment _ _) (AdjBranch currbranch) origbra
-- Make git checkout quiet to avoid warnings about disconnected -- Make git checkout quiet to avoid warnings about disconnected
-- branch tips being lost. -- branch tips being lost.
checkoutAdjustedBranch b [Param "--quiet"] checkoutAdjustedBranch b [Param "--quiet"]
reenterAdjustedBranch adj@(LinkAdjustment _) _ origbranch = preventCommits $ \commitlck -> do updateAdjustedBranch adj@(LinkAdjustment _) _ origbranch = preventCommits $ \commitlck -> do
-- Not really needed here, but done for consistency. -- Not really needed here, but done for consistency.
_ <- propigateAdjustedCommits' origbranch adj commitlck _ <- propigateAdjustedCommits' origbranch adj commitlck
-- No need to do anything else, because link adjustments are stable. -- No need to do anything else, because link adjustments are stable.