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

change name of basis branch

Browse source 
Making the name look too much like the adjusted branch was ambiguous.
This commit is contained in:
Joey Hess 2016-04-09 14:17:20 -04:00
parent 7d28110c68
commit b5be04027c
Failed to extract signature
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/AdjustedBranch.hs
View file

@ -106,10 +106,10 @@ type AdjBranch = Branch
newtype BasisBranch = BasisBranch Ref newtype BasisBranch = BasisBranch Ref
-- The basis for refs/heads/adjusted/master(unlocked) is -- The basis for refs/heads/adjusted/master(unlocked) is
-- refs/adjusted/master(unlocked). -- refs/basis/adjusted/master(unlocked).
basisBranch :: AdjBranch -> BasisBranch basisBranch :: AdjBranch -> BasisBranch
basisBranch adjbranch = BasisBranch $ basisBranch adjbranch = BasisBranch $
Ref ("refs/" ++ fromRef (Git.Ref.base adjbranch)) Ref ("refs/basis/" ++ fromRef (Git.Ref.base adjbranch))
adjustedBranchPrefix :: String adjustedBranchPrefix :: String
adjustedBranchPrefix = "refs/heads/adjusted/" adjustedBranchPrefix = "refs/heads/adjusted/"