summaryrefslogtreecommitdiff
path: root/Upgrade
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-09 15:10:26 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-09 15:10:26 -0400
commit02625cd3767d9fd5be07f1198b763fcb2b63da5d (patch)
tree5ea1cf03951cc70d3863f1c93c3a3d3fff9764ec /Upgrade
parent618caf2765803eb50ebae67b2e04a3f6055ce883 (diff)
add AdjBranch newtype; some simplications
Diffstat (limited to 'Upgrade')
-rw-r--r--Upgrade/V5.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Upgrade/V5.hs b/Upgrade/V5.hs
index ee213b613..08e9271a0 100644
--- a/Upgrade/V5.hs
+++ b/Upgrade/V5.hs
@@ -54,12 +54,12 @@ upgrade automatic = do
{- Create adjusted branch where all files are unlocked.
- This should have the same content for each file as
- have been staged in upgradeDirectWorkTree. -}
- adjbranch <- adjustBranch UnlockAdjustment cur
+ AdjBranch b <- adjustBranch UnlockAdjustment cur
{- Since the work tree was already set up by
- upgradeDirectWorkTree, and contains unlocked file
- contents too, don't use git checkout to check out the
- adjust branch. Instead, update HEAD manually. -}
- inRepo $ setHeadRef adjbranch
+ inRepo $ setHeadRef b
configureSmudgeFilter
-- Inode sentinal file was only used in direct mode and when
-- locking down files as they were added. In v6, it's used more